From 2a4a7f06d888d68059f40cb16fd32c90f0dcd392 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 13:09:23 +0200 Subject: [PATCH] chore(deps): Bump docker/build-push-action from 6.4.1 to 6.5.0 (#3232) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.4.1 to 6.5.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.4.1...v6.5.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 01920a19863ee26db2d2b533ff667db5474a29f9) # Conflicts: # .github/workflows/docker-push.yml --- .github/workflows/docker-push.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 4bc91fcd015..3b5bed207e2 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -46,7 +46,11 @@ jobs: flavor: "latest=false" - name: Build and push docker image +<<<<<<< HEAD uses: docker/build-push-action@v6.3.0 +======= + uses: docker/build-push-action@v6.5.0 +>>>>>>> 01920a1 (chore(deps): Bump docker/build-push-action from 6.4.1 to 6.5.0 (#3232)) with: context: . file: Dockerfile