fix: PAN-1832 change dev image tag (#62)

* fix: PAN-1832 change dev image tag
pantos-io · Jul 24, 2024 · 1d8cdf6 · 1d8cdf6
1 parent ae6d151
commit 1d8cdf6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -19,6 +19,6 @@ jobs:
     needs: [build]
     secrets: 'inherit'
     with:
-      tag: ${{ needs.build.outputs.version }}-development
+      tag: development
       architecture: amd64
       environment: main
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
@@ -15,6 +15,11 @@ on:
         description: 'Environment where the secrets are stored'
         required: true
         type: string
+      extra_tag:
+        description: 'Additional tag to push'
+        required: false
+        type: string
+        default: ""
     secrets:
       DOCKERHUB_USERNAME:
         description: 'Docker Hub username'
@@ -81,6 +86,11 @@ jobs:
 
       - name: Build and push the images
         run: |
+          if [ -n "${{ inputs.extra_tag }}" ]; then
+            export EXTRA_TAG="${{ inputs.extra_tag }}"
+          else 
+            export EXTRA_TAG=$DOCKER_TAG
+          fi
           docker buildx bake \
             --set "*.cache-from=type=local,src=/tmp/.buildx-cache" \
             --set "*.cache-to=type=local,dest=/tmp/.buildx-cache-new" \

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -59,6 +59,7 @@ jobs:
       tag: ${{ github.event.release.tag_name }}${{ needs.define-environment.outputs.deployment_environment }}
       architecture: amd64
       environment: dockerhub
+      extra_tag: ${{ github.event.release.prerelease && 'beta' || 'latest' }}
 
   build:
     name: Build and attach .deb and .whl package

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,14 +7,15 @@ networks:
 services:
   app:
     restart: always
-    image: pantosio/service-node-app:${DOCKER_TAG-latest}
+    image: pantosio/service-node-app:${DOCKER_TAG-local}
     build:
       context: .
       dockerfile: Dockerfile
       target: servicenode
       x-bake:
         tags:
-          - ${DOCKER_REGISTRY-pantosio}/service-node-app:${DOCKER_TAG-latest}
+          - ${DOCKER_REGISTRY-pantosio}/service-node-app:${DOCKER_TAG-local}
+          - ${DOCKER_REGISTRY-pantosio}/service-node-worker:${EXTRA_TAG-local}
     networks:
       pantos-service-node:
     env_file: []
@@ -35,14 +36,15 @@ services:
       - db
   worker:
     restart: always
-    image: pantosio/service-node-worker:${DOCKER_TAG-latest}
+    image: pantosio/service-node-worker:${DOCKER_TAG-local}
     build:
       context: .
       dockerfile: Dockerfile
       target: servicenode-celery-worker
       x-bake:
         tags:
-          - ${DOCKER_REGISTRY-pantosio}/service-node-worker:${DOCKER_TAG-latest}
+          - ${DOCKER_REGISTRY-pantosio}/service-node-worker:${DOCKER_TAG-local}
+          - ${DOCKER_REGISTRY-pantosio}/service-node-worker:${EXTRA_TAG-local}
     networks:
       pantos-service-node:
     env_file: []