Merge branch 'master' into secrets_backend

.github/workflows/nodejs-artifact.yml

@@ -0,0 +1,32 @@
+name: Cache to Artifact
+
+on:
+  workflow_dispatch:
+    inputs:
+      cacheKey:
+        description: 'Cache Key Hash'
+        required: true
+
+jobs:
+  cache-to-artifact:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Restore cache
+      uses: actions/cache@v2
+      with:
+        path: image.tar
+        key: ghcr.io/kreneskyp/ix/nodejs:${{ github.event.inputs.cacheKey }}
+
+    - name: Archive cache
+      run: |
+        tar -czf cache.${{ github.event.inputs.cacheKey }}.tar.gz image.tar
+
+    - name: Upload cache as artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: cache-artifact
+        path: cache.${{ github.event.inputs.cacheKey }}.tar.gz

Dockerfile

@@ -67,6 +67,7 @@ ENV PATH $PATH:$NODE_MODULES_BIN
 
 # build config
 COPY package.json $NPM_DIR
+COPY package-lock.json $NPM_DIR
 COPY babel.config.js $NPM_DIR
 COPY relay.config.js $NPM_DIR
 COPY webpack.config.js $NPM_DIR

Makefile

@@ -120,7 +120,7 @@ image: .compiled-static ${IMAGE_SENTINEL} ${IMAGE_SENTINEL_PSQL}
 
 # nodejs / frontend builder image
 .PHONY: nodejs
-nodejs: ${IMAGE_SENTINEL_NODEJS}
+nodejs: ${IMAGE_SENTINEL_NODEJS} .vault.env
 
 
 # full frontend build

README.md

@@ -132,7 +132,7 @@ ix scale 5
 
 The client may start a specific version, including the unstable `dev` image built on `master` branch.
 ```bash
-pip up --version dev
+ix up --version dev
 ```
 
 

docker-compose.yml

@@ -70,6 +70,7 @@ services:
     volumes:
       - ./frontend:/var/app/frontend
       - ./package.json:/var/app/package.json
+      - ./package-lock.json:/var/app/package-lock.json
       - ./babel.config.js:/var/app/babel.config.js
       - ./relay.config.js:/var/app/relay.config.js
       - ./webpack.config.js:/var/app/webpack.config.js