From 0611c67d350d3b76034b6407a9628a2a08b09a56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 14 Jan 2024 02:11:52 -0800 Subject: [PATCH] Bump docker/metadata-action from 5.3.0 to 5.5.0 (#147) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5.3.0 to 5.5.0. - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](https://github.com/docker/metadata-action/compare/v5.3.0...v5.5.0) --- updated-dependencies: - dependency-name: docker/metadata-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 aada4631a5a1b069a2f501021d908bb37b9beacb) # Conflicts: # .github/workflows/docker.yaml --- .github/workflows/docker.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index c1064989..e8254167 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -42,7 +42,11 @@ jobs: - name: Extract Docker metadata if: env.PUSH == 'true' id: meta +<<<<<<< HEAD uses: docker/metadata-action@v4.6.0 +======= + uses: docker/metadata-action@v5.5.0 +>>>>>>> aada463 (Bump docker/metadata-action from 5.3.0 to 5.5.0 (#147)) with: images: ghcr.io/${{ github.repository }} tags: | @@ -88,7 +92,11 @@ jobs: - name: Extract Docker metadata if: env.PUSH == 'true' id: meta +<<<<<<< HEAD uses: docker/metadata-action@v4.6.0 +======= + uses: docker/metadata-action@v5.5.0 +>>>>>>> aada463 (Bump docker/metadata-action from 5.3.0 to 5.5.0 (#147)) with: images: ghcr.io/${{ github.repository }} tags: | @@ -129,7 +137,11 @@ jobs: - name: Extract Docker metadata if: env.PUSH == 'true' id: meta +<<<<<<< HEAD uses: docker/metadata-action@v4.6.0 +======= + uses: docker/metadata-action@v5.5.0 +>>>>>>> aada463 (Bump docker/metadata-action from 5.3.0 to 5.5.0 (#147)) with: images: ghcr.io/${{ github.repository }} tags: | @@ -169,7 +181,11 @@ jobs: - name: Extract Docker metadata if: env.PUSH == 'true' id: meta +<<<<<<< HEAD uses: docker/metadata-action@v5.0.0 +======= + uses: docker/metadata-action@v5.5.0 +>>>>>>> aada463 (Bump docker/metadata-action from 5.3.0 to 5.5.0 (#147)) with: images: ghcr.io/${{ github.repository }} tags: |