Merge pull request #119 from JarvusInnovations/develop

Release: hologit v0.35.1

.npmignore

@@ -10,9 +10,11 @@
 /.holo/
 /docs/
 /github-actions
+/script/
 /studio/
 .bldr.toml
 .eslintrc.json
 jsconfig.json
 *.md
+mkdocs.yml
 !README.md

lib/Studio.js

@@ -201,6 +201,8 @@ class Studio {
             if (uid && gid && username) {
                 logger.info(`configuring container to use user: ${username}`);
                 await containerExec(container, 'adduser', '-u', `${uid}`, '-G', 'developer', '-D', username);
+                await containerExec(container, 'mkdir', '-p', `/home/${username}/.hab`);
+                await containerExec(container, 'ln', '-sf', '/hab/cache', `/home/${username}/.hab/`);
                 container.defaultUser = `${uid}:${gid}`;
             }
 

plan.sh

@@ -11,7 +11,7 @@ pkg_build_deps=(
 pkg_deps=(
   core/git
   jarvus/node14 # newer than core/node12
-  core/hab/0.79.1 # last version before new license
+  core/hab/0.79.0 # last version before new license
 )
 
 pkg_bin_dirs=(bin)

studio/Dockerfile

@@ -1,5 +1,5 @@
 # common base for both stages
-FROM habitat/default-studio-x86_64-linux:0.79.1 as base
+FROM habitat/default-studio-x86_64-linux:0.79.0 as base
 
 ARG HAB_LICENSE=no-accept
 ENV HAB_LICENSE=$HAB_LICENSE
@@ -9,7 +9,7 @@ ENTRYPOINT ["hab", "sup", "run"]
 CMD ["jarvus/hologit-studio"]
 
 RUN hab pkg install \
-        core/hab-sup/0.79.1 \
+        core/hab-sup/0.79.0 \
         core/hab-launcher/10180 \
         core/tar \
         core/gcc \
@@ -28,4 +28,6 @@ RUN mkdir -m 1777 -p /tmp \
 
 ARG HOLOGIT_STUDIO_PACKAGE=jarvus/hologit-studio
 RUN hab pkg install $HOLOGIT_STUDIO_PACKAGE \
-    && hab pkg exec core/coreutils rm -rf /hab/cache/{artifacts,src}/
+    && rm -rf /hab/cache/{artifacts,src}/ \
+    && chgrp -R developer /hab \
+    && chmod -R g=u /hab

studio/plan.sh

@@ -6,7 +6,7 @@ pkg_license=("MIT")
 pkg_maintainer="Chris Alfano <chris@jarv.us>"
 
 pkg_build_deps=(
-  core/hab/0.79.1
+  core/hab/0.79.0
 )
 pkg_deps=(
   core/busybox-static