diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 00000000..6b235f6b --- /dev/null +++ b/.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 }} \ No newline at end of file diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 3d410405..12ba0b27 100644 --- a/frontend/Dockerfile +++ b/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 diff --git a/frontend/package.json b/frontend/package.json index 43072ce4..14744ca8 100644 --- a/frontend/package.json +++ b/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", diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx index 35ee4e90..b71313cc 100644 --- a/frontend/src/views/LoginPage.jsx +++ b/frontend/src/views/LoginPage.jsx @@ -240,8 +240,8 @@ const LoginDialog = props => { - 2. Ensure vm.max_map_count is set:

- sudo sysctl -w vm.max_map_count=262144 + 2. Restart docker-compose:

+ sudo docker-compose restart