diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc169ecacbb..b62404c71e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,9 +23,6 @@ jobs: releaser: runs-on: ubuntu-24.04 steps: - - - name: Checkout - uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -34,7 +31,7 @@ jobs: driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - name: Build - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: files: | docker-bake.hcl @@ -56,8 +53,9 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: + source: . files: | docker-bake.hcl targets: release @@ -66,8 +64,9 @@ jobs: *.cache-to=type=gha,scope=build,mode=max - name: Check Cloudfront config - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: + source: . targets: aws-cloudfront-update env: DRY_RUN: true @@ -99,20 +98,18 @@ jobs: - dockerfile-lint - path-warnings steps: - - - name: Checkout - uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Validate - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: files: | docker-bake.hcl targets: ${{ matrix.target }} set: | + *.args.BUILDKIT_CONTEXT_KEEP_GIT_DIR=1 *.cache-to=type=gha,scope=validate-${{ matrix.target }},mode=max *.cache-from=type=gha,scope=validate-${{ matrix.target }} *.cache-from=type=gha,scope=build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a4e6d9b9047..8ce0b6285e8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -90,8 +90,9 @@ jobs: driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - name: Build website - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: + source: . files: | docker-bake.hcl targets: release @@ -127,8 +128,9 @@ jobs: - name: Update S3 config if: ${{ env.DOCS_S3_BUCKET != '' && env.DOCS_S3_CONFIG != '' }} - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: + source: . files: | docker-bake.hcl targets: aws-s3-update-config @@ -141,8 +143,9 @@ jobs: - name: Update Cloudfront config if: ${{ env.DOCS_CLOUDFRONT_ID != '' }} - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: + source: . files: | docker-bake.hcl targets: aws-cloudfront-update diff --git a/.github/workflows/validate-upstream.yml b/.github/workflows/validate-upstream.yml index 79c048f6284..3f013523ca2 100644 --- a/.github/workflows/validate-upstream.yml +++ b/.github/workflows/validate-upstream.yml @@ -90,8 +90,9 @@ jobs: driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - name: Validate - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: + source: . files: | docker-bake.hcl targets: validate-upstream diff --git a/content/manuals/build/bake/remote-definition.md b/content/manuals/build/bake/remote-definition.md index 89e454e2453..ff13e70a4db 100644 --- a/content/manuals/build/bake/remote-definition.md +++ b/content/manuals/build/bake/remote-definition.md @@ -174,9 +174,8 @@ and use the `cwd://` prefix for the metadata Bake file: ```yml - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: - source: "${{ github.server_url }}/${{ github.repository }}.git#${{ github.ref }}" files: | ./docker-bake.hcl cwd://${{ steps.meta.outputs.bake-file }} diff --git a/content/manuals/build/ci/github-actions/annotations.md b/content/manuals/build/ci/github-actions/annotations.md index df52d16afa0..5491d671b9d 100644 --- a/content/manuals/build/ci/github-actions/annotations.md +++ b/content/manuals/build/ci/github-actions/annotations.md @@ -72,9 +72,6 @@ jobs: docker: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Login to Docker Hub uses: docker/login-action@v3 with: @@ -91,12 +88,12 @@ jobs: images: ${{ env.IMAGE_NAME }} - name: Build - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: files: | ./docker-bake.hcl - ${{ steps.meta.outputs.bake-file-tags }} - ${{ steps.meta.outputs.bake-file-annotations }} + cwd://${{ steps.meta.outputs.bake-file-tags }} + cwd://${{ steps.meta.outputs.bake-file-annotations }} push: true ``` diff --git a/content/manuals/build/ci/github-actions/build-summary.md b/content/manuals/build/ci/github-actions/build-summary.md index c41c654c042..b60c6442cbd 100644 --- a/content/manuals/build/ci/github-actions/build-summary.md +++ b/content/manuals/build/ci/github-actions/build-summary.md @@ -20,7 +20,7 @@ or [Docker Buildx Bake](https://github.com/marketplace/actions/docker-buildx-bak GitHub Actions: - `docker/build-push-action@v6` -- `docker/bake-action@v5` +- `docker/bake-action@v6` To view the job summary, open the details page for the job in GitHub after the job has finished. The summary is available for both failed and successful diff --git a/content/manuals/build/ci/github-actions/checks.md b/content/manuals/build/ci/github-actions/checks.md index dc3bda46314..c9dbccff14c 100644 --- a/content/manuals/build/ci/github-actions/checks.md +++ b/content/manuals/build/ci/github-actions/checks.md @@ -78,9 +78,6 @@ jobs: docker: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Login to Docker Hub uses: docker/login-action@v3 with: @@ -91,12 +88,12 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Validate build configuration - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: targets: validate-build - name: Build - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: targets: build push: true diff --git a/content/manuals/build/ci/github-actions/multi-platform.md b/content/manuals/build/ci/github-actions/multi-platform.md index a04c73562cb..86d5349eddd 100644 --- a/content/manuals/build/ci/github-actions/multi-platform.md +++ b/content/manuals/build/ci/github-actions/multi-platform.md @@ -350,9 +350,6 @@ jobs: platform=${{ matrix.platform }} echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - name: Checkout - uses: actions/checkout@v4 - - name: Download meta bake definition uses: actions/download-artifact@v4 with: @@ -373,11 +370,11 @@ jobs: - name: Build id: bake - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: files: | ./docker-bake.hcl - /tmp/bake-meta.json + cwd:///tmp/bake-meta.json targets: image set: | *.tags= diff --git a/content/manuals/build/ci/github-actions/reproducible-builds.md b/content/manuals/build/ci/github-actions/reproducible-builds.md index d7c88a9b14d..038c64020ac 100644 --- a/content/manuals/build/ci/github-actions/reproducible-builds.md +++ b/content/manuals/build/ci/github-actions/reproducible-builds.md @@ -56,14 +56,11 @@ jobs: docker: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 env: SOURCE_DATE_EPOCH: 0 ``` @@ -115,9 +112,6 @@ jobs: docker: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -125,7 +119,7 @@ jobs: run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV - name: Build - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 env: SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }} ``` diff --git a/content/manuals/build/ci/github-actions/secrets.md b/content/manuals/build/ci/github-actions/secrets.md index 2048b2c7766..e24ea725d56 100644 --- a/content/manuals/build/ci/github-actions/secrets.md +++ b/content/manuals/build/ci/github-actions/secrets.md @@ -198,9 +198,6 @@ jobs: docker: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Set up SSH uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # v3.1.0 with: @@ -209,7 +206,7 @@ jobs: private-key-name: github-ppk - name: Build - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: set: | *.ssh=default