Merge pull request #608 from crazy-max/update-readme

readme: update to v6
Merge pull request #609 from docker/dependabot/github_actions/docker/bake-action-7
2026-03-17 12:10:50 +00:00 · 2026-03-16 17:57:09 -07:00 · 2026-03-09 12:35:19 -07:00 · 2026-03-09 16:25:29 +01:00 · 2026-03-09 16:22:40 +01:00 · 2026-03-06 19:22:22 +00:00
5 changed files with 49 additions and 57 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -83,7 +83,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -119,7 +119,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -153,7 +153,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -184,7 +184,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -207,7 +207,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -228,7 +228,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -258,7 +258,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -288,7 +288,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -323,7 +323,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver-opts: network=host
@@ -345,7 +345,7 @@ jobs:
            type=sha
      -
        name: Build and push to local registry
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          context: ./test
          file: ./test/Dockerfile
@@ -371,7 +371,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
      -
@@ -393,7 +393,7 @@ jobs:
            type=sha
      -
        name: Build
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v7
        with:
          files: |
            ./test/docker-bake.hcl
@@ -416,7 +416,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -444,7 +444,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -462,7 +462,7 @@ jobs:
            maintainer=Foo
      -
        name: Build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          context: ./test
          file: ./test/output.Dockerfile
@@ -507,7 +507,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
      -
@@ -531,7 +531,7 @@ jobs:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
      -
        name: Build
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v7
        with:
          files: |
            ./test/docker-bake.hcl
@@ -548,7 +548,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
@@ -574,7 +574,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: latest
      -
@@ -583,7 +583,7 @@ jobs:
        uses: ./
      -
        name: Build
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v7
        with:
          source: .
          files: |
@@ -607,7 +607,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
        with:
          version: ${{ env.BUILDX_VERSION }}
          driver: docker
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
        uses: actions/checkout@v6
      -
        name: Test
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v7
        with:
          source: .
          targets: test
--- a/.github/workflows/update-dist.yml
+++ b/.github/workflows/update-dist.yml
@@ -28,7 +28,7 @@ jobs:
          token: ${{ steps.docker-read-app.outputs.token || github.token }}
      -
        name: Build
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v7
        with:
          source: .
          targets: build
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -15,15 +15,15 @@ jobs:
  prepare:
    runs-on: ubuntu-latest
    outputs:
-      targets: ${{ steps.generate.outputs.targets }}
+      matrix: ${{ steps.generate.outputs.matrix }}
    steps:
      -
        name: Checkout
        uses: actions/checkout@v6
      -
-        name: List targets
+        name: Generate matrix
        id: generate
-        uses: docker/bake-action/subaction/list-targets@v6
+        uses: docker/bake-action/subaction/matrix@v7
        with:
          target: validate

@@ -34,10 +34,10 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        target: ${{ fromJson(needs.prepare.outputs.targets) }}
+        include: ${{ fromJson(needs.prepare.outputs.matrix) }}
    steps:
      -
        name: Validate
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v7
        with:
          targets: ${{ matrix.target }}
--- a/README.md
+++ b/README.md
@@ -75,27 +75,23 @@ jobs:
  docker:
    runs-on: ubuntu-latest
    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v6
      -
        name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: name/app
      -
        name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      -
        name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
-          context: .
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -129,13 +125,10 @@ jobs:
  docker:
    runs-on: ubuntu-latest
    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v6
      -
        name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: |
            name/app
@@ -147,15 +140,14 @@ jobs:
      -
        name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      -
        name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
-          context: .
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -210,7 +202,7 @@ jobs:
      -
        name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: |
            name/app
@@ -222,7 +214,7 @@ jobs:
            type=sha
      -
        name: Build
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v7
        with:
          files: |
            ./docker-bake.hcl
@@ -269,7 +261,7 @@ similar to the previous one:
 ```yaml
      -
        name: Build
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v7
        with:
          files: |
            ./docker-bake.hcl
@@ -336,7 +328,7 @@ Alternatively, each output is also exported as an environment variable when `DOC
 So it can be used with our [Docker Build Push action](https://github.com/docker/build-push-action/):

 ```yaml
- uses: docker/build-push-action@v6
+- uses: docker/build-push-action@v7
  with:
    build-args: |
      DOCKER_METADATA_OUTPUT_JSON
@@ -728,7 +720,7 @@ increase this length for larger repositories by setting the
      -
        name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: |
            name/app
@@ -939,13 +931,13 @@ that you can reuse them further in your workflow using the [`fromJSON` function]
 ```yaml
      -
        name: Docker meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        id: meta
        with:
          images: name/app
      -
        name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -965,7 +957,7 @@ this:
      -
        name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: name/app
          labels: |
@@ -987,12 +979,12 @@ of the `metadata-action`:
 ```yaml
      -
        name: Docker meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: name/app
      -
        name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          tags: ${{ steps.meta.outputs.tags }}
          annotations: ${{ steps.meta.outputs.annotations }}
@@ -1003,12 +995,12 @@ The same can be done with the [`bake-action`](https://github.com/docker/bake-act
 ```yaml
      -
        name: Docker meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: name/app
      -
        name: Build
-        uses: docker/bake-action@v6
+        uses: docker/bake-action@v7
        with:
          files: |
            ./docker-bake.hcl
@@ -1032,14 +1024,14 @@ Please consult the documentation of your registry.
 ```yaml
      -
        name: Docker meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: name/app
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
      -
        name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          tags: ${{ steps.meta.outputs.tags }}
          annotations: ${{ steps.meta.outputs.annotations }}
Author	SHA1	Message	Date
Tõnis Tiigi	dde548f160	Merge pull request #608 from crazy-max/update-readme readme: update to v6	2026-03-16 17:57:09 -07:00
Tõnis Tiigi	b13d25e5fc	Merge pull request #609 from docker/dependabot/github_actions/docker/bake-action-7 chore(deps): Bump docker/bake-action from 6 to 7	2026-03-09 12:35:19 -07:00
CrazyMax	f58488e265	Merge pull request #612 from docker/dependabot/github_actions/docker/build-push-action-7 chore(deps): Bump docker/build-push-action from 6 to 7	2026-03-09 16:25:29 +01:00
CrazyMax	414af88e96	ci: switch to matrix subaction Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2026-03-09 16:22:40 +01:00
dependabot[bot]	2c2d4fb584	chore(deps): Bump docker/build-push-action from 6 to 7 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6 to 7. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6...v7) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-06 19:22:22 +00:00
CrazyMax	85e876bd3a	Merge pull request #610 from docker/dependabot/github_actions/docker/setup-buildx-action-4 chore(deps): Bump docker/setup-buildx-action from 3 to 4	2026-03-06 09:54:50 +01:00
CrazyMax	0b0903be56	readme: update to v6 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2026-03-05 22:25:27 +01:00
dependabot[bot]	e2d26b25bd	chore(deps): Bump docker/setup-buildx-action from 3 to 4 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3 to 4. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-05 19:22:33 +00:00
dependabot[bot]	a26abf68b2	chore(deps): Bump docker/bake-action from 6 to 7 Bumps [docker/bake-action](https://github.com/docker/bake-action) from 6 to 7. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v6...v7) --- updated-dependencies: - dependency-name: docker/bake-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-05 19:22:30 +00:00