Merge branch 'main' into dependabot/npm_and_yarn/admin/cookie-0.7.0

SoCSTech · Feb 3, 2025 · 6823b5e · 6823b5e
2 parents bbf3ca3 + 1272552
commit 6823b5e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/build-docker-admin.yml b/.github/workflows/build-docker-admin.yml
@@ -70,8 +70,9 @@ jobs:
           context: ./admin
           file: ./admin/Dockerfile
           push: true
-          # tags: |
-          #   ghcr.io/socstech/asgard-admin:pr-${{ github.event.number }}
+          tags: |
+            ghcr.io/socstech/asgard-admin:pr-${{ github.event.number }}
+            ghcr.io/socstech/asgard-admin:${{ github.sha }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

diff --git a/.github/workflows/build-docker-api.yml b/.github/workflows/build-docker-api.yml
@@ -92,8 +92,9 @@ jobs:
           context: ./api
           file: ./api/Dockerfile
           push: true
-          # tags: |
-          #   ghcr.io/socstech/asgard-api:pr-${{ github.event.number }}
+          tags: |
+            ghcr.io/socstech/asgard-api:pr-${{ github.event.number }}
+            ghcr.io/socstech/asgard-api:${{ github.sha }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

diff --git a/.github/workflows/build-docker-jobs.yml b/.github/workflows/build-docker-jobs.yml
@@ -70,8 +70,9 @@ jobs:
           context: ./jobs
           file: ./jobs/Dockerfile
           push: true
-          # tags: |
-          #   ghcr.io/socstech/asgard-jobs:pr-${{ github.event.number }}
+          tags: |
+            ghcr.io/socstech/asgard-jobs:pr-${{ github.event.number }}
+            ghcr.io/socstech/asgard-jobs:${{ github.sha }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max