change docker image/version to keep package names

icrc · May 30, 2024 · 6bd40c4 · 6bd40c4
1 parent e83a6d6
commit 6bd40c4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/publish-mariadb-2.5.12-docker-image.yml b/.github/workflows/publish-mariadb-2.5.12-docker-image.yml
@@ -5,7 +5,8 @@ on:
 # See https://docs.github.com/en/actions/publishing-packages/publishing-docker-images#publishing-images-to-github-packages
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: mariadb-10-openmrs-2.5.12
+  IMAGE_NAME: mariadb-10-openmrs
+  IMAGE_VERSION: 2.5.12
   IMAGE_TAG: latest
   CONTEXT: ./database
 jobs:
@@ -34,8 +35,8 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=${{ env.IMAGE_TAG }}
-            type=sha
+            type=raw,value=${{ env.IMAGE_VERSION }}-${{ env.IMAGE_TAG }}
+            type=sha,prefix=${{ env.IMAGE_VERSION }}-
 
       - name: Build and push MariaDB Docker image
         uses: docker/build-push-action@v5

diff --git a/.github/workflows/publish-mariadb-2.6.4-docker-image.yml b/.github/workflows/publish-mariadb-2.6.4-docker-image.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: mariadb-10-openmrs-2.6.4
+  IMAGE_NAME: mariadb-10-openmrs
+  IMAGE_VERSION: 2.6.4
   IMAGE_TAG: latest
   CONTEXT: ./database
 jobs:
@@ -33,8 +34,8 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=${{ env.IMAGE_TAG }}
-            type=sha
+            type=raw,value=${{ env.IMAGE_VERSION }}-${{ env.IMAGE_TAG }}
+            type=sha,prefix=${{ env.IMAGE_VERSION }}-
 
       - name: Build and push MariaDB Docker image
         uses: docker/build-push-action@v5

diff --git a/.github/workflows/publish-openmrs-backend-docker-image.yml b/.github/workflows/publish-openmrs-backend-docker-image.yml
@@ -9,7 +9,8 @@ on:
       - backend/**
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: openmrs-backend-2.5.13
+  IMAGE_NAME: openmrs-backend
+  IMAGE_VERSION: 2.5.13
   IMAGE_TAG: latest
   CONTEXT: ./backend
 jobs:
@@ -38,8 +39,8 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=${{ env.IMAGE_TAG }}
-            type=sha
+            type=raw,value=${{ env.IMAGE_VERSION }}-${{ env.IMAGE_TAG }}
+            type=sha,prefix=${{ env.IMAGE_VERSION }}-
 
       - name: Build and push Backend Docker image
         uses: docker/build-push-action@v5

diff --git a/.github/workflows/publish-openmrs-frontend-docker-image.yml b/.github/workflows/publish-openmrs-frontend-docker-image.yml
@@ -9,7 +9,8 @@ on:
       - frontend/**
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: openmrs-frontend-qa
+  IMAGE_NAME: openmrs-frontend
+  IMAGE_VERSION: qa
   IMAGE_TAG: latest
   CONTEXT: ./frontend
 jobs:
@@ -38,8 +39,8 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=${{ env.IMAGE_TAG }}
-            type=sha
+            type=raw,value=${{ env.IMAGE_VERSION }}-${{ env.IMAGE_TAG }}
+            type=sha,prefix=${{ env.IMAGE_VERSION }}-
 
       - name: Build and push Frontend Docker image
         uses: docker/build-push-action@v5