From caaa614816435d0bcdd9f70f2278e96c03dce56d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Sep 2024 14:00:34 -0700
Subject: [PATCH] Bump docker/build-push-action from 6.6.1 to 6.7.0 (#35)
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.6.1 to 6.7.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v6.6.1...v6.7.0)
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 922e43e21cca241f2f22fd01a650ac4d61e155c2)
# 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 839a874..0b8dea5 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.7.0
+>>>>>>> 922e43e (Bump docker/build-push-action from 6.6.1 to 6.7.0 (#35))
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.7.0
+>>>>>>> 922e43e (Bump docker/build-push-action from 6.6.1 to 6.7.0 (#35))
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.7.0
+>>>>>>> 922e43e (Bump docker/build-push-action from 6.6.1 to 6.7.0 (#35))
with:
context: .
file: .docker/Dockerfile