From aab1fc6fd9c28605f07dc4e6761a1ad8eb46ba48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 20:06:50 -0700 Subject: [PATCH] Bump docker/build-push-action from 6.5.0 to 6.6.1 (#17) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.5.0 to 6.6.1. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.5.0...v6.6.1) --- 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 f40691cc4b50dc2d5d7c1875cc63653d0b3a902d) # Conflicts: # .github/workflows/docker.yml --- .github/workflows/docker.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 42448b7..015d47f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,7 +45,11 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image +<<<<<<< HEAD uses: docker/build-push-action@v6.1.0 +======= + uses: docker/build-push-action@v6.6.1 +>>>>>>> f40691c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#17)) with: context: . file: .docker/Dockerfile @@ -86,7 +90,11 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image +<<<<<<< HEAD uses: docker/build-push-action@v6.1.0 +======= + uses: docker/build-push-action@v6.6.1 +>>>>>>> f40691c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#17)) with: context: . file: .docker/Dockerfile @@ -127,7 +135,11 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image +<<<<<<< HEAD uses: docker/build-push-action@v6.1.0 +======= + uses: docker/build-push-action@v6.6.1 +>>>>>>> f40691c (Bump docker/build-push-action from 6.5.0 to 6.6.1 (#17)) with: context: . file: .docker/Dockerfile