Merge branch 'main' into dependabot/docker/alpine-3.20.2

ministryofjustice · Jul 24, 2024 · 0f84fb2 · 0f84fb2
2 parents db7f9ae + 57a2f88
commit 0f84fb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,15 +27,15 @@ jobs:
 
       - name: Log in to GitHub Container Registry
         id: login_ghcr
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and Push
         id: build_and_push
-        uses: docker/build-push-action@1ca370b3a9802c92e886402e0dd88098a2533b12 # v6.4.1
+        uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
         with:
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ github.ref_name }}

diff --git a/.github/workflows/scan-image.yml b/.github/workflows/scan-image.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Build Image
         id: build_image
-        uses: docker/build-push-action@1ca370b3a9802c92e886402e0dd88098a2533b12 # v6.4.1
+        uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
         with:
           push: false
           load: true
@@ -42,7 +42,7 @@ jobs:
       - name: Upload SARIF
         if: always()
         id: upload_sarif
-        uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
         with:
           sarif_file: trivy-results.sarif