Merge remote-tracking branch 'refs/remotes/origin/master'

Loudbooks · Dec 6, 2024 · 14856d9 · 14856d9
2 parents 403dd26 + 47bf7e1
commit 14856d9
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -40,22 +40,32 @@ jobs:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Get Commit Hash
+      id: get_commit_hash
+      run: echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
     - name: Build and push frontend Docker image to GHCR
       uses: docker/build-push-action@v3
       with:
         context: ./frontend
         file: ./frontend/Dockerfile
+        build-args: |
+          COMMIT_HASH=${{ env.hash }}
         push: true
-        tags: ghcr.io/loudbooks/pastebook-frontend:latest
+        tags: |
+          ghcr.io/loudbooks/pastebook-frontend:latest
+          ghcr.io/loudbooks/pastebook-frontend:${{ env.hash }}
 
     - name: Build and push backend Docker image to GHCR
       uses: docker/build-push-action@v3
       with:
         context: ./backend
         file: ./backend/Dockerfile
         push: true
-        tags: ghcr.io/loudbooks/pastebook-backend:latest
+        tags: |
+          ghcr.io/loudbooks/pastebook-backend:latest
+          ghcr.io/loudbooks/pastebook-backend:${{ env.hash }}
 
     - name: Log in to Docker Hub
       uses: docker/login-action@v2