Merge branch 'pooki3bear-ci-init' into launch

.github/workflows/ci.yaml

@@ -0,0 +1,66 @@
+name: ci
+
+on:
+  push:
+    branches: master
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+         - app: frontend
+           path: frontend
+           version: 0.8.3
+           experimental: true
+         - app: backend
+           path: backend
+           version: 0.8.3
+           experimental: false
+         - app: orborus
+           path: functions/onprem/orborus
+           version: 0.8.0
+           experimental: false
+         - app: database
+           path: backend/database
+           version: 0.8.0
+           experimental: false
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#        Use below configuration for ghcr.io
+#        with:
+#          registry: ghcr.io
+#          username: ${{ github.repository_owner }}
+#          password: ${{ secrets.CR_PAT }} 
+      -
+        name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        env:
+          BUILDX_NO_DEFAULT_LOAD: true
+        with:
+          context: ${{ matrix.path }}/
+          file: ${{ matrix.path }}/Dockerfile          
+          platforms: linux/amd64,linux/arm64
+          #,linux/386 - no node image I guess?
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:${{ matrix.version }}
+      -
+        name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

frontend/Dockerfile

@@ -8,7 +8,6 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 
 COPY package.json /usr/src/app/package.json
 
-#RUN npm install --verbose
 RUN yarn install 
 
 # copy only required files to not trigger rebuilding every time

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shuffler",
   "homepage": "https://shuffler.io",
-  "version": "0.9.22",
+  "version": "0.9.24",
   "private": true,
   "dependencies": {
     "@material-ui/core": "^4.5.2",
@@ -19,23 +19,23 @@
     "cytoscape-clipboard": "^2.2.1",
     "cytoscape-cxtmenu": "^3.1.1",
     "cytoscape-edgehandles": "^3.6.0",
-    "cytoscape-grid-guide": "~2.1.2",
+    "cytoscape-grid-guide": "~2.3.3",
     "cytoscape-node-html-label": "^1.1.5",
     "cytoscape-panzoom": "^2.5.2",
     "cytoscape-undo-redo": "^1.3.2",
-    "d3": "~4.10.0",
+    "d3": "^7.1.1",
     "dotenv": "^6.1.0",
     "downshift": "^3.3.5",
     "github-markdown-css": "^3.0.1",
     "import": "0.0.6",
     "interweave": "^11.2.0",
-    "material-icons": "^0.3.1",
+    "material-icons": "^0.7.7",
     "material-icons-react": "^1.0.4",
     "material-ui-chip-input": "^2.0.0-beta.2",
     "material-ui-nested-menu-item": "^1.0.2",
     "md5-file": "^4.0.0",
     "mdbreact": "^4.21.1",
-    "moment": "~2.20.1",
+    "moment": "^2.29.1",
     "react": "^16.14.0",
     "react-alert": "^5.5.0",
     "react-alert-template-basic": "^1.0.0",
@@ -66,7 +66,7 @@
     "websocket": "^1.0.30",
     "yaml": "^1.7.2",
     "yamljs": "^0.3.0",
-    "zone.js": "~0.8.26"
+    "zone.js": "~0.11.4"
   },
   "scripts": {
     "start": "react-scripts start",

frontend/src/views/LoginPage.jsx

@@ -240,8 +240,8 @@ const LoginDialog = props => {
 							</Typography>
 
 							<Typography variant="body2" style={{marginBottom: 20, color: "white",}}>
-								<b>2</b>. Ensure vm.max_map_count is set:<br/><br/>
+								<b>2</b>. Restart docker-compose:<br/><br/>
-								sudo sysctl -w vm.max_map_count=262144 			
+								sudo docker-compose restart 			
 							</Typography>
 						</Paper>
 						<Typography variant="body2" style={{marginBottom: 10, color: "white", marginTop: 20, }}>