Fix automatic Docker image building with mono-image

.github/workflows/build-images.yml

@@ -16,9 +16,10 @@ jobs:
         id: builder
         uses: docker/setup-buildx-action@master
 
-
       - name: "Append ARM buildx builder from AWS"
         uses: baschny/append-buildx-action@v1
+        timeout-minutes: 1  # Limit the connection time to one minute
+        continue-on-error: true
         with:
           builder: ${{ steps.builder.outputs.name }}
           endpoint: ssh://${{ secrets.ARM_SSH_CONNECTION_STRING }}
@@ -43,25 +44,18 @@ jobs:
           username: giskardai
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push
-        uses: docker/bake-action@master
+      - name: Build and push image based on the current branch
         env:
-          TAG: ${{ (steps.extract_branch.outputs.tag == 'main' && 'dev') || steps.extract_branch.outputs.tag }}
-        with:
-          push: true
-          set: |
-            *.attest=type=provenance,enabled=false
-            *.platform=linux/amd64
-            *.platform=linux/arm64
+          IMAGE: docker.io/giskardai/giskard
+        run: |
+          docker buildx build \
+          --platform linux/amd64,linux/arm64 \
+          --tag $IMAGE:${{ steps.extract_branch.outputs.tag }} \
+          --file Dockerfile \
+          --push \
+          .
 
       - name: Invoke deployment hook
         if: ${{ steps.extract_branch.outputs.branch == 'main' }}
         run: |
           curl -L --silent --max-time 900 ${{ secrets.TEST_SERVER_WEBHOOK_URL_BASE }}/redeploy-dev
-
-      - name: Remove containers and volumes
-        run: |
-          docker-compose down -v --remove-orphans
-          docker builder prune --force --keep-storage=10GB
-
-

.github/workflows/build-release-images.yml

@@ -1,9 +1,9 @@
 name: Build and publish released version
 
 on:
-#  push:
-#    tags:
-#      - "v*.*.*"
+  push:
+    tags:
+      - "v*.*.*"
   workflow_dispatch:
 
 jobs:
@@ -20,6 +20,8 @@ jobs:
 
       - name: Append ARM buildx builder from AWS
         uses: baschny/append-buildx-action@v1
+        timeout-minutes: 1  # Limit the connection time to one minute
+        continue-on-error: true
         with:
           builder: ${{ steps.builder.outputs.name }}
           endpoint: ssh://${{ secrets.ARM_SSH_CONNECTION_STRING }}
@@ -38,54 +40,6 @@ jobs:
           username: giskardai
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build <current version>+latest backend image
-        if: ${{ steps.tag.outputs.name == steps.tag.outputs.latest_version }}
-        env:
-          IMAGE: docker.io/giskardai/backend
-        run: |
-          docker buildx build \
-          --platform linux/amd64,linux/arm64 \
-          --tag $IMAGE:latest \
-          --tag $IMAGE:${{ steps.tag.outputs.version }} \
-          --file backend/src/main/docker/app/app.dockerfile \
-          --push \
-          .
-
-      - name: Build <current version> backend image
-        if: ${{ steps.tag.outputs.name != steps.tag.outputs.latest_version }}
-        env:
-          IMAGE: docker.io/giskardai/backend
-        run: |
-          docker buildx build \
-          --platform linux/amd64,linux/arm64 \
-          --tag $IMAGE:${{ steps.tag.outputs.version }} \
-          --file backend/src/main/docker/app/app.dockerfile \
-          --push \
-          .
-
-      - name: Build <current version>+latest frontend image
-        if: ${{ steps.tag.outputs.name == steps.tag.outputs.latest_version }}
-        env:
-          IMAGE: docker.io/giskardai/frontend
-        run: |
-          docker buildx build \
-          --platform linux/amd64,linux/arm64 \
-          --tag $IMAGE:latest \
-          --tag $IMAGE:${{ steps.tag.outputs.version }} \
-          --push \
-          frontend
-
-      - name: Build <current version> frontend image
-        if: ${{ steps.tag.outputs.name != steps.tag.outputs.latest_version }}
-        env:
-          IMAGE: docker.io/giskardai/frontend
-        run: |
-          docker buildx build \
-          --platform linux/amd64,linux/arm64 \
-          --tag $IMAGE:${{ steps.tag.outputs.version }} \
-          --push \
-          frontend
-
       - name: Build <current version>+latest global image
         if: ${{ steps.tag.outputs.name == steps.tag.outputs.latest_version }}
         env:

Dockerfile

@@ -21,7 +21,6 @@ WORKDIR /app
 COPY python-client python-client
 COPY frontend frontend
 COPY backend backend
-COPY common common
 COPY gradle gradle
 # Copying .git to make gradle-git-properties gradle plugin work
 COPY .git .git