Optimize docker process (sqlpad#1170)

rickbergfalk · web-flow · commit ac40a26dbf3a · 2022-12-03T22:02:03.000-06:00
* Don't run tests, lint during docker build

* Update docker-ci-tags.yml

* Update docker-ci-latest.yml
diff --git a/.github/workflows/docker-ci-latest.yml b/.github/workflows/docker-ci-latest.yml
@@ -10,17 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: true
           platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/docker-ci-tags.yml b/.github/workflows/docker-ci-tags.yml
@@ -1,13 +1,13 @@
 # https://github.com/docker/metadata-action
-# https://github.com/docker/build-push-action/blob/master/docs/advanced/tags-labels.md
+# https://docs.docker.com/build/ci/github-actions/examples/#manage-tags-and-labels
 name: docker-ci-tags
 
 on:
   push:
     branches:
       - 'master'
     tags:
-      - 'v*'
+      - 'v*.*.*'
   pull_request:
     branches:
       - 'master'
@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -33,20 +33,19 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
@@ -35,7 +35,7 @@ RUN yarn
 WORKDIR /sqlpad/client
 RUN yarn
 WORKDIR /sqlpad/server
-RUN yarn
+RUN yarn --production
 WORKDIR /sqlpad
 
 # Copy rest of the project into docker
@@ -47,20 +47,6 @@ RUN npm run build --prefix client && \
     mkdir server/public && \
     cp -r client/build/* server/public
 
-# Build test db used for dev, debugging and running tests
-RUN node server/generate-test-db-fixture.js
-
-# Run tests and linting to validate build
-ENV SKIP_INTEGRATION true
-RUN npm run test --prefix server
-RUN npm run lint
-
-# Remove any dev dependencies from server
-# We don't care about root or client directories 
-# as they are not going to be copied to next stage
-WORKDIR /sqlpad/server
-RUN npm prune --production
-
 # Start another stage with a fresh node
 # Copy the server directory that has all the necessary node modules + front end build
 FROM node:16-bullseye-slim as bundle
