Merge branch 'main' into deps/js/node-22.x

hashintel · Nov 29, 2024 · 6b96922 · 6b96922
2 parents 716075a + 9f25ecf
commit 6b96922
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/actions/build-docker-images/action.yml b/.github/actions/build-docker-images/action.yml
@@ -64,7 +64,7 @@ runs:
 
     - name: Build hash-graph image
       if: inputs.hash-graph == 'true' && github.event.pull_request.head.repo.full_name == github.repository
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
       with:
         context: .
         file: apps/hash-graph/docker/Dockerfile
@@ -87,7 +87,7 @@ runs:
 
     - name: Build hash-graph image (fork)
       if: inputs.hash-graph == 'true' && github.event.pull_request.head.repo.full_name != github.repository
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
       with:
         context: .
         file: apps/hash-graph/docker/Dockerfile
@@ -103,7 +103,7 @@ runs:
 
     - name: Build hash-ai-worker-ts image
       if: inputs.hash-ai-worker-ts == 'true' && github.event.pull_request.head.repo.full_name == github.repository
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
       with:
         context: .
         file: apps/hash-ai-worker-ts/docker/Dockerfile
@@ -122,7 +122,7 @@ runs:
 
     - name: Build hash-ai-worker-ts image (fork)
       if: inputs.hash-ai-worker-ts == 'true' && github.event.pull_request.head.repo.full_name != github.repository
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
       with:
         context: .
         file: apps/hash-ai-worker-ts/docker/Dockerfile
@@ -134,7 +134,7 @@ runs:
 
     - name: Build hash-integration-worker image
       if: inputs.hash-integration-worker == 'true' && github.event.pull_request.head.repo.full_name == github.repository
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
       with:
         context: .
         file: apps/hash-integration-worker/docker/Dockerfile
@@ -151,7 +151,7 @@ runs:
 
     - name: Build hash-integration-worker image (fork)
       if: inputs.hash-integration-worker == 'true' && github.event.pull_request.head.repo.full_name != github.repository
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
       with:
         context: .
         file: apps/hash-integration-worker/docker/Dockerfile
@@ -161,7 +161,7 @@ runs:
 
     - name: Build hash-api image
       if: inputs.hash-api == 'true' && github.event.pull_request.head.repo.full_name == github.repository
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
       with:
         context: .
         file: infra/docker/api/prod/Dockerfile
@@ -178,7 +178,7 @@ runs:
 
     - name: Build hash-api image (fork)
       if: inputs.hash-api == 'true' && github.event.pull_request.head.repo.full_name != github.repository
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
       with:
         context: .
         file: infra/docker/api/prod/Dockerfile

diff --git a/.github/actions/docker-build-push/action.yml b/.github/actions/docker-build-push/action.yml
@@ -61,7 +61,7 @@ runs:
 
     # Build images and push to ECR
     - name: Build and push ${{inputs.SHORTNAME}} image
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
       env:
         GH_RUN_ID: ${{ github.run_id }}
       with: