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](docker/build-push-action@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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 01920a1) # Conflicts: # .github/workflows/docker-push.yml
cosmos · Jul 29, 2024 · 2a4a7f0 · 2a4a7f0
1 parent 3f54062
commit 2a4a7f0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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/[email protected]
+=======
+        uses: docker/[email protected]
+>>>>>>> 01920a1 (chore(deps): Bump docker/build-push-action from 6.4.1 to 6.5.0 (#3232))
         with:
           context: .
           file: Dockerfile