Merge branch 'master' of https://github.com/sandialabs/slycat

sandialabs · Nov 4, 2021 · 8669adf · 8669adf
2 parents b167966 + e4ee331
commit 8669adf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/docker/compose/slycat-compose/docker-compose.yml b/docker/compose/slycat-compose/docker-compose.yml
@@ -38,7 +38,7 @@ services:
         - bash
         - -c
         - | 
-          npm install \
+          NODE_TLS_REJECT_UNAUTHORIZED=0 npm install \
           && npm run dev
       ports:
         - 9000:9000

diff --git a/docker/compose/slycat-compose/slycat-client/DockerFile b/docker/compose/slycat-compose/slycat-client/DockerFile
@@ -1,13 +1,14 @@
-FROM node
+FROM node:16
+# :lts-alpine
 # see https://github.com/sass/node-sass/issues/3077 locking down to node 15 until this is resolved
 WORKDIR /usr/src/slycat
 RUN git config --global http.sslVerify false
 RUN git clone --depth 1 https://github.com/sandialabs/slycat.git
 WORKDIR /usr/src/slycat/slycat
-RUN npm config set registry http://registry.npmjs.org/
+#RUN npm config set registry http://registry.npmjs.org/
 RUN npm config set strict-ssl false
 RUN NODE_TLS_REJECT_UNAUTHORIZED=0 npm install node-sass --save-dev
-RUN npm install
+RUN NODE_TLS_REJECT_UNAUTHORIZED=0 npm install
 # RUN npm rebuild node-sass
 #  No need to rebuild node-sass anymore since it was replaced with dart-sass
 CMD ls