From b61aa9c601b281384a055133312e86a079b37830 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:16:04 +0200 Subject: [PATCH 1/2] build: bump bake-action to v5 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/build/ci/github-actions/annotations.md | 2 +- content/build/ci/github-actions/multi-platform.md | 2 +- content/build/ci/github-actions/reproducible-builds.md | 4 ++-- content/build/ci/github-actions/secrets.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/build/ci/github-actions/annotations.md b/content/build/ci/github-actions/annotations.md index a45fa1f7a9c..ee7c9972c46 100644 --- a/content/build/ci/github-actions/annotations.md +++ b/content/build/ci/github-actions/annotations.md @@ -93,7 +93,7 @@ jobs: images: ${{ env.IMAGE_NAME }} - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v5 with: files: | ./docker-bake.hcl diff --git a/content/build/ci/github-actions/multi-platform.md b/content/build/ci/github-actions/multi-platform.md index 1d56f3888b7..93ca41e7fe4 100644 --- a/content/build/ci/github-actions/multi-platform.md +++ b/content/build/ci/github-actions/multi-platform.md @@ -299,7 +299,7 @@ jobs: - name: Build id: bake - uses: docker/bake-action@v4 + uses: docker/bake-action@v5 with: files: | ./docker-bake.hcl diff --git a/content/build/ci/github-actions/reproducible-builds.md b/content/build/ci/github-actions/reproducible-builds.md index bcb33cd7a37..34ce6a8e5df 100644 --- a/content/build/ci/github-actions/reproducible-builds.md +++ b/content/build/ci/github-actions/reproducible-builds.md @@ -66,7 +66,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v5 env: SOURCE_DATE_EPOCH: 0 ``` @@ -132,7 +132,7 @@ jobs: run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v5 env: SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }} ``` diff --git a/content/build/ci/github-actions/secrets.md b/content/build/ci/github-actions/secrets.md index 970a979cf14..ce45dad6a0b 100644 --- a/content/build/ci/github-actions/secrets.md +++ b/content/build/ci/github-actions/secrets.md @@ -217,7 +217,7 @@ jobs: private-key-name: github-ppk - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v5 with: set: | *.ssh=default From 208e19c67c208d06cf05bf1bc6b163bec6ebfba9 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:17:26 +0200 Subject: [PATCH 2/2] build: bump build-push-action to v6 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/build/cache/backends/gha.md | 4 ++-- content/build/ci/github-actions/annotations.md | 4 ++-- content/build/ci/github-actions/attestations.md | 4 ++-- content/build/ci/github-actions/cache.md | 10 +++++----- content/build/ci/github-actions/configure-builder.md | 6 +++--- .../build/ci/github-actions/copy-image-registries.md | 2 +- content/build/ci/github-actions/export-docker.md | 2 +- content/build/ci/github-actions/local-registry.md | 2 +- content/build/ci/github-actions/manage-tags-labels.md | 2 +- content/build/ci/github-actions/multi-platform.md | 4 ++-- content/build/ci/github-actions/named-contexts.md | 10 +++++----- .../build/ci/github-actions/push-multi-registries.md | 2 +- content/build/ci/github-actions/reproducible-builds.md | 4 ++-- content/build/ci/github-actions/secrets.md | 4 ++-- content/build/ci/github-actions/share-image-jobs.md | 2 +- content/build/ci/github-actions/test-before-push.md | 4 ++-- .../build/ci/github-actions/update-dockerhub-desc.md | 2 +- content/build/cloud/ci.md | 2 +- content/includes/gha-tutorial.md | 4 ++-- content/language/cpp/configure-ci-cd.md | 2 +- content/language/dotnet/configure-ci-cd.md | 4 ++-- content/language/golang/configure-ci-cd.md | 2 +- content/language/java/configure-ci-cd.md | 4 ++-- content/language/nodejs/configure-ci-cd.md | 4 ++-- content/language/php/configure-ci-cd.md | 4 ++-- content/language/python/configure-ci-cd.md | 2 +- content/language/r/configure-ci-cd.md | 2 +- content/language/rust/configure-ci-cd.md | 2 +- content/scout/integrations/ci/gha.md | 2 +- 29 files changed, 51 insertions(+), 51 deletions(-) diff --git a/content/build/cache/backends/gha.md b/content/build/cache/backends/gha.md index b0eaedc6f8c..9a390ab71e4 100644 --- a/content/build/cache/backends/gha.md +++ b/content/build/cache/backends/gha.md @@ -92,7 +92,7 @@ For example: ```yaml - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true @@ -141,7 +141,7 @@ action. You can also set the `ghtoken` parameter manually using the ```yaml - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true diff --git a/content/build/ci/github-actions/annotations.md b/content/build/ci/github-actions/annotations.md index ee7c9972c46..699ea5d86ca 100644 --- a/content/build/ci/github-actions/annotations.md +++ b/content/build/ci/github-actions/annotations.md @@ -51,7 +51,7 @@ jobs: images: ${{ env.IMAGE_NAME }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: tags: ${{ steps.meta.outputs.tags }} annotations: ${{ steps.meta.outputs.annotations }} @@ -151,7 +151,7 @@ jobs: DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: tags: ${{ steps.meta.outputs.tags }} annotations: ${{ steps.meta.outputs.annotations }} diff --git a/content/build/ci/github-actions/attestations.md b/content/build/ci/github-actions/attestations.md index 8f91509d108..4e6cee18f49 100644 --- a/content/build/ci/github-actions/attestations.md +++ b/content/build/ci/github-actions/attestations.md @@ -81,7 +81,7 @@ jobs: images: ${{ env.IMAGE_NAME }} - name: Build and push image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true @@ -131,7 +131,7 @@ jobs: images: ${{ env.IMAGE_NAME }} - name: Build and push image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . sbom: true diff --git a/content/build/ci/github-actions/cache.md b/content/build/ci/github-actions/cache.md index 0465868cd36..a49214db088 100644 --- a/content/build/ci/github-actions/cache.md +++ b/content/build/ci/github-actions/cache.md @@ -41,7 +41,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true @@ -78,7 +78,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true @@ -127,7 +127,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true @@ -208,7 +208,7 @@ jobs: cache-source: go-build-cache - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . cache-from: type=gha @@ -267,7 +267,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true diff --git a/content/build/ci/github-actions/configure-builder.md b/content/build/ci/github-actions/configure-builder.md index 77efe1b2ca9..c844b343c83 100644 --- a/content/build/ci/github-actions/configure-builder.md +++ b/content/build/ci/github-actions/configure-builder.md @@ -58,7 +58,7 @@ jobs: buildkitd-flags: --debug - name: Build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . ``` @@ -324,14 +324,14 @@ jobs: id: builder2 - name: Build against builder1 - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: builder: ${{ steps.builder1.outputs.name }} context: . target: mytarget1 - name: Build against builder2 - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: builder: ${{ steps.builder2.outputs.name }} context: . diff --git a/content/build/ci/github-actions/copy-image-registries.md b/content/build/ci/github-actions/copy-image-registries.md index 47558895c5d..3b9b13ca7be 100644 --- a/content/build/ci/github-actions/copy-image-registries.md +++ b/content/build/ci/github-actions/copy-image-registries.md @@ -40,7 +40,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/build/ci/github-actions/export-docker.md b/content/build/ci/github-actions/export-docker.md index 2043a03fbbc..9eaaa3173db 100644 --- a/content/build/ci/github-actions/export-docker.md +++ b/content/build/ci/github-actions/export-docker.md @@ -25,7 +25,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . load: true diff --git a/content/build/ci/github-actions/local-registry.md b/content/build/ci/github-actions/local-registry.md index b55ab857107..26fef8db8b5 100644 --- a/content/build/ci/github-actions/local-registry.md +++ b/content/build/ci/github-actions/local-registry.md @@ -34,7 +34,7 @@ jobs: driver-opts: network=host - name: Build and push to local registry - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true diff --git a/content/build/ci/github-actions/manage-tags-labels.md b/content/build/ci/github-actions/manage-tags-labels.md index 8a68557ffd2..bee0279b49c 100644 --- a/content/build/ci/github-actions/manage-tags-labels.md +++ b/content/build/ci/github-actions/manage-tags-labels.md @@ -69,7 +69,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: ${{ github.event_name != 'pull_request' }} diff --git a/content/build/ci/github-actions/multi-platform.md b/content/build/ci/github-actions/multi-platform.md index 93ca41e7fe4..2c072ec2f96 100644 --- a/content/build/ci/github-actions/multi-platform.md +++ b/content/build/ci/github-actions/multi-platform.md @@ -40,7 +40,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 @@ -113,7 +113,7 @@ jobs: - name: Build and push by digest id: build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: ${{ matrix.platform }} diff --git a/content/build/ci/github-actions/named-contexts.md b/content/build/ci/github-actions/named-contexts.md index edfdfdaf9b4..9ca0dc2926e 100644 --- a/content/build/ci/github-actions/named-contexts.md +++ b/content/build/ci/github-actions/named-contexts.md @@ -38,7 +38,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . build-contexts: | @@ -79,7 +79,7 @@ jobs: driver: docker - name: Build base image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: ./base file: ./base/Dockerfile @@ -87,7 +87,7 @@ jobs: tags: my-base-image:latest - name: Build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . build-contexts: | @@ -137,7 +137,7 @@ jobs: driver-opts: network=host - name: Build base image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: ./base file: ./base/Dockerfile @@ -145,7 +145,7 @@ jobs: push: true - name: Build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . build-contexts: | diff --git a/content/build/ci/github-actions/push-multi-registries.md b/content/build/ci/github-actions/push-multi-registries.md index 6fa95d09c1d..cfedd8b169f 100644 --- a/content/build/ci/github-actions/push-multi-registries.md +++ b/content/build/ci/github-actions/push-multi-registries.md @@ -40,7 +40,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/build/ci/github-actions/reproducible-builds.md b/content/build/ci/github-actions/reproducible-builds.md index 34ce6a8e5df..74c144ac118 100644 --- a/content/build/ci/github-actions/reproducible-builds.md +++ b/content/build/ci/github-actions/reproducible-builds.md @@ -38,7 +38,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . tags: user/app:latest @@ -101,7 +101,7 @@ jobs: run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV - name: Build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . tags: user/app:latest diff --git a/content/build/ci/github-actions/secrets.md b/content/build/ci/github-actions/secrets.md index ce45dad6a0b..c03e2fd36a4 100644 --- a/content/build/ci/github-actions/secrets.md +++ b/content/build/ci/github-actions/secrets.md @@ -52,7 +52,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 @@ -185,7 +185,7 @@ jobs: private-key-name: github-ppk - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . ssh: default diff --git a/content/build/ci/github-actions/share-image-jobs.md b/content/build/ci/github-actions/share-image-jobs.md index 63234ea3a03..604a0a5b5aa 100644 --- a/content/build/ci/github-actions/share-image-jobs.md +++ b/content/build/ci/github-actions/share-image-jobs.md @@ -28,7 +28,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build and export - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . tags: myimage:latest diff --git a/content/build/ci/github-actions/test-before-push.md b/content/build/ci/github-actions/test-before-push.md index 119d24d19e1..2678a3545c8 100644 --- a/content/build/ci/github-actions/test-before-push.md +++ b/content/build/ci/github-actions/test-before-push.md @@ -42,7 +42,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and export to Docker - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . load: true @@ -53,7 +53,7 @@ jobs: docker run --rm ${{ env.TEST_TAG }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/build/ci/github-actions/update-dockerhub-desc.md b/content/build/ci/github-actions/update-dockerhub-desc.md index 989067b22ad..a325e5895b5 100644 --- a/content/build/ci/github-actions/update-dockerhub-desc.md +++ b/content/build/ci/github-actions/update-dockerhub-desc.md @@ -34,7 +34,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true diff --git a/content/build/cloud/ci.md b/content/build/cloud/ci.md index f4b235e737f..74bd1fd3e74 100644 --- a/content/build/cloud/ci.md +++ b/content/build/cloud/ci.md @@ -78,7 +78,7 @@ jobs: endpoint: "/default" install: true - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . tags: "" diff --git a/content/includes/gha-tutorial.md b/content/includes/gha-tutorial.md index 0e36761e843..3c5cf98a99e 100644 --- a/content/includes/gha-tutorial.md +++ b/content/includes/gha-tutorial.md @@ -91,7 +91,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile @@ -148,7 +148,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile diff --git a/content/language/cpp/configure-ci-cd.md b/content/language/cpp/configure-ci-cd.md index dc67ee4c1c3..0841be1263d 100644 --- a/content/language/cpp/configure-ci-cd.md +++ b/content/language/cpp/configure-ci-cd.md @@ -89,7 +89,7 @@ to Docker Hub. uses: docker/setup-buildx-action@v3 - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/language/dotnet/configure-ci-cd.md b/content/language/dotnet/configure-ci-cd.md index 8afd18d5bd7..cfbdcacb628 100644 --- a/content/language/dotnet/configure-ci-cd.md +++ b/content/language/dotnet/configure-ci-cd.md @@ -97,14 +97,14 @@ to Docker Hub. uses: docker/setup-buildx-action@v3 - name: Build and test - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . target: build load: true - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/language/golang/configure-ci-cd.md b/content/language/golang/configure-ci-cd.md index 55370ae023d..8e01284f829 100644 --- a/content/language/golang/configure-ci-cd.md +++ b/content/language/golang/configure-ci-cd.md @@ -89,7 +89,7 @@ to Docker Hub. uses: docker/setup-buildx-action@v3 - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/language/java/configure-ci-cd.md b/content/language/java/configure-ci-cd.md index 786af141da0..e09bb97ef43 100644 --- a/content/language/java/configure-ci-cd.md +++ b/content/language/java/configure-ci-cd.md @@ -92,14 +92,14 @@ to Docker Hub. uses: docker/setup-buildx-action@v3 - name: Build and test - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . target: test load: true - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/language/nodejs/configure-ci-cd.md b/content/language/nodejs/configure-ci-cd.md index 04a4d343221..d3bfbb3f636 100644 --- a/content/language/nodejs/configure-ci-cd.md +++ b/content/language/nodejs/configure-ci-cd.md @@ -91,14 +91,14 @@ to Docker Hub. uses: docker/setup-buildx-action@v3 - name: Build and test - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . target: test load: true - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64/v8 diff --git a/content/language/php/configure-ci-cd.md b/content/language/php/configure-ci-cd.md index 37f63542746..47b37864e18 100644 --- a/content/language/php/configure-ci-cd.md +++ b/content/language/php/configure-ci-cd.md @@ -97,14 +97,14 @@ to Docker Hub. uses: docker/setup-buildx-action@v3 - name: Build and test - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . target: test load: true - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/language/python/configure-ci-cd.md b/content/language/python/configure-ci-cd.md index 20faf5eadaf..c162837700a 100644 --- a/content/language/python/configure-ci-cd.md +++ b/content/language/python/configure-ci-cd.md @@ -89,7 +89,7 @@ to Docker Hub. uses: docker/setup-buildx-action@v3 - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/language/r/configure-ci-cd.md b/content/language/r/configure-ci-cd.md index 29ecc7d1a2e..1312cfc0b41 100644 --- a/content/language/r/configure-ci-cd.md +++ b/content/language/r/configure-ci-cd.md @@ -89,7 +89,7 @@ to Docker Hub. uses: docker/setup-buildx-action@v3 - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/content/language/rust/configure-ci-cd.md b/content/language/rust/configure-ci-cd.md index 326d13ff7a0..8d5eb6e096b 100644 --- a/content/language/rust/configure-ci-cd.md +++ b/content/language/rust/configure-ci-cd.md @@ -89,7 +89,7 @@ to Docker Hub. uses: docker/setup-buildx-action@v3 - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true diff --git a/content/scout/integrations/ci/gha.md b/content/scout/integrations/ci/gha.md index b1878454a87..2304fde26aa 100644 --- a/content/scout/integrations/ci/gha.md +++ b/content/scout/integrations/ci/gha.md @@ -88,7 +88,7 @@ jobs: # (don't push on PR, load instead) - name: Build and push Docker image id: build-and-push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . sbom: ${{ github.event_name != 'pull_request' }}