9 changed files with 80 additions and 190 deletions
--- a/.github/build-push-summary.png
+++ b/.github/build-push-summary.png
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -1345,30 +1345,7 @@ jobs:
        run: |
          docker image inspect localhost:5000/name/app:latest

-  summary-disable:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: action
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: ${{ inputs.buildx-version || env.BUILDX_VERSION }}
-          driver-opts: |
-            image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }}
-      -
-        name: Build
-        uses: ./action
-        with:
-          file: ./test/Dockerfile
-        env:
-          DOCKER_BUILD_SUMMARY: false
-
-  summary-disable-deprecated:
+  disable-summary:
    runs-on: ubuntu-latest
    steps:
      -
@ -1391,51 +1368,7 @@ jobs:
        env:
          DOCKER_BUILD_NO_SUMMARY: true

-  summary-not-supported:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: action
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: v0.12.1
-          driver-opts: |
-            image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }}
-      -
-        name: Build
-        uses: ./action
-        with:
-          file: ./test/Dockerfile
-
-  record-upload-disable:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: action
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: ${{ inputs.buildx-version || env.BUILDX_VERSION }}
-          driver-opts: |
-            image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }}
-      -
-        name: Build
-        uses: ./action
-        with:
-          file: ./test/Dockerfile
-        env:
-          DOCKER_BUILD_RECORD_UPLOAD: false
-
-  record-retention-days:
+  export-retention-days:
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
@ -1462,4 +1395,4 @@ jobs:
        with:
          file: ./test/Dockerfile
        env:
-          DOCKER_BUILD_RECORD_RETENTION_DAYS: ${{ matrix.days }}
+          DOCKER_BUILD_EXPORT_RETENTION_DAYS: ${{ matrix.days }}
--- a/README.md
+++ b/README.md
@ -19,7 +19,21 @@ ___
  * [Git context](#git-context)
  * [Path context](#path-context)
 * [Examples](#examples)
-* [Summaries](#summaries)
+  * [Multi-platform image](https://docs.docker.com/build/ci/github-actions/multi-platform/)
+  * [Secrets](https://docs.docker.com/build/ci/github-actions/secrets/)
+  * [Push to multi-registries](https://docs.docker.com/build/ci/github-actions/push-multi-registries/)
+  * [Manage tags and labels](https://docs.docker.com/build/ci/github-actions/manage-tags-labels/)
+  * [Cache management](https://docs.docker.com/build/ci/github-actions/cache/)
+  * [Export to Docker](https://docs.docker.com/build/ci/github-actions/export-docker/)
+  * [Test before push](https://docs.docker.com/build/ci/github-actions/test-before-push/)
+  * [Local registry](https://docs.docker.com/build/ci/github-actions/local-registry/)
+  * [Share built image between jobs](https://docs.docker.com/build/ci/github-actions/share-image-jobs/)
+  * [Named contexts](https://docs.docker.com/build/ci/github-actions/named-contexts/)
+  * [Copy image between registries](https://docs.docker.com/build/ci/github-actions/copy-image-registries/)
+  * [Update Docker Hub repo description](https://docs.docker.com/build/ci/github-actions/update-dockerhub-desc/)
+  * [SBOM and provenance attestations](https://docs.docker.com/build/ci/github-actions/attestations/)
+  * [Annotations](https://docs.docker.com/build/ci/github-actions/annotations/)
+  * [Reproducible builds](https://docs.docker.com/build/ci/github-actions/reproducible-builds/)
 * [Customizing](#customizing)
  * [inputs](#inputs)
  * [outputs](#outputs)
@ -55,6 +69,8 @@ name: ci

 on:
  push:
+    branches:
+      - 'main'

 jobs:
  docker:
@ -92,6 +108,11 @@ expression `{{defaultContext}}`. Here we can use it to provide a subdirectory
 to the default Git context:

 ```yaml
+      -
+        # Setting up Docker Buildx with docker-container driver is required
+        # at the moment to be able to use a subdirectory with Git context
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
      -
        name: Build and push
        uses: docker/build-push-action@v6
@ -124,6 +145,8 @@ name: ci

 on:
  push:
+    branches:
+      - 'main'

 jobs:
  docker:
@ -171,31 +194,11 @@ jobs:
 * [Annotations](https://docs.docker.com/build/ci/github-actions/annotations/)
 * [Reproducible builds](https://docs.docker.com/build/ci/github-actions/reproducible-builds/)

-## Summaries
-
-This action generates a [job summary](https://github.blog/2022-05-09-supercharging-github-actions-with-job-summaries/)
-that provides a detailed overview of the build execution. The summary shows an
-overview of all the steps executed during the build, including the build inputs
-and eventual errors.
-
-![build-push-action job summary](./.github/build-push-summary.png)
-
-The summary also includes a link for downloading the build record with
-additional details about the build, including build stats, logs, outputs, and
-more. The build record can be imported to Docker Desktop for inspecting the
-build in greater detail.
-
-Summaries are enabled by default, but can be disabled with the
-`DOCKER_BUILD_SUMMARY` [environment variable](#environment-variables).
-
-For more information about summaries, refer to the
-[documentation](https://docs.docker.com/go/build-summary/).
-
 ## Customizing

 ### inputs

-The following inputs can be used as `step.with` keys:
+Following inputs can be used as `step.with` keys

 > `List` type is a newline-delimited string
 > ```yaml
@ -256,11 +259,10 @@ The following outputs are available:

 ### environment variables

-| Name                                 | Type   | Default | Description                                                                                                                                                                                                                                                        |
-|--------------------------------------|--------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `DOCKER_BUILD_SUMMARY`               | Bool   | `true`  | If `false`, [build summary](https://docs.docker.com/build/ci/github-actions/build-summary/) generation is disabled                                                                                                                                                 |
-| `DOCKER_BUILD_RECORD_UPLOAD`         | Bool   | `true`  | If `false`, build record upload as [GitHub artifact](https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts) is disabled                                                                                                            |
-| `DOCKER_BUILD_RECORD_RETENTION_DAYS` | Number |         | Duration after which build record artifact will expire in days. Defaults to repository/org [retention settings](https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy) if unset or `0` |
+| Name                                 | Type   | Description                                                                                                                                                                                                                                                        |
+|--------------------------------------|--------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `DOCKER_BUILD_NO_SUMMARY`            | Bool   | If `true`, [build summary](https://docs.docker.com/build/ci/github-actions/build-summary/) generation is disabled                                                                                                                                                  |
+| `DOCKER_BUILD_EXPORT_RETENTION_DAYS` | Number | Duration after which build export artifact will expire in days. Defaults to repository/org [retention settings](https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#artifact-and-log-retention-policy) if unset or `0` |

 ## Troubleshooting

--- a/dist/index.js
+++ b/dist/index.js
--- a/dist/index.js.map
+++ b/dist/index.js.map
--- a/package.json
+++ b/package.json
@ -27,7 +27,7 @@
  "packageManager": "yarn@3.6.3",
  "dependencies": {
    "@actions/core": "^1.10.1",
-    "@docker/actions-toolkit": "0.31.0",
+    "@docker/actions-toolkit": "0.28.0",
    "handlebars": "^4.7.7"
  },
  "devDependencies": {
--- a/src/main.ts
+++ b/src/main.ts
@ -13,9 +13,7 @@ import {GitHub} from '@docker/actions-toolkit/lib/github';
 import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
 import {Util} from '@docker/actions-toolkit/lib/util';

-import {BuilderInfo} from '@docker/actions-toolkit/lib/types/buildx/builder';
 import {ConfigFile} from '@docker/actions-toolkit/lib/types/docker/docker';
-import {UploadArtifactResponse} from '@docker/actions-toolkit/lib/types/github';

 import * as context from './context';

@ -82,10 +80,10 @@ actionsToolkit.run(
      await toolkit.buildx.printVersion();
    });

-    let builder: BuilderInfo;
    await core.group(`Builder info`, async () => {
-      builder = await toolkit.builder.inspect(inputs.builder);
+      const builder = await toolkit.builder.inspect(inputs.builder);
      core.info(JSON.stringify(builder, null, 2));
+      stateHelper.setBuilder(builder);
    });

    const args: string[] = await context.getArgs(inputs, toolkit);
@ -107,6 +105,7 @@ actionsToolkit.run(
    const imageID = toolkit.buildxBuild.resolveImageID();
    const metadata = toolkit.buildxBuild.resolveMetadata();
    const digest = toolkit.buildxBuild.resolveDigest();
+
    if (imageID) {
      await core.group(`ImageID`, async () => {
        core.info(imageID);
@ -126,65 +125,43 @@ actionsToolkit.run(
        core.setOutput('metadata', metadatadt);
      });
    }
-
-    let ref: string;
    await core.group(`Reference`, async () => {
-      ref = await buildRef(toolkit, startedTime, inputs.builder);
+      const ref = await buildRef(toolkit, startedTime, inputs.builder);
      if (ref) {
        core.info(ref);
        stateHelper.setBuildRef(ref);
      } else {
-        core.info('No build reference found');
+        core.warning('No build ref found');
      }
    });
-
-    await core.group(`Check build summary support`, async () => {
-      if (!buildSummaryEnabled()) {
-        core.info('Build summary disabled');
-      } else if (GitHub.isGHES) {
-        core.warning('Build summary is not yet supported on GHES');
-      } else if (!(await toolkit.buildx.versionSatisfies('>=0.13.0'))) {
-        core.warning('Build summary requires Buildx >= 0.13.0');
-      } else if (builder && builder.driver === 'cloud') {
-        core.warning('Build summary is not yet supported with Docker Build Cloud');
-      } else if (!ref) {
-        core.warning('Build summary requires a build reference');
-      } else {
-        core.info('Build summary supported!');
-        stateHelper.setSummarySupported();
-      }
-    });
-
    if (err) {
      throw err;
    }
  },
  // post
  async () => {
-    if (stateHelper.isSummarySupported) {
+    if (stateHelper.buildRef.length > 0) {
      await core.group(`Generating build summary`, async () => {
+        if (process.env.DOCKER_BUILD_NO_SUMMARY && Util.parseBool(process.env.DOCKER_BUILD_NO_SUMMARY)) {
+          core.info('Summary disabled');
+          return;
+        }
+        if (stateHelper.builder && stateHelper.builder.driver === 'cloud') {
+          core.info('Summary is not yet supported with Docker Build Cloud');
+          return;
+        }
        try {
-          const recordUploadEnabled = buildRecordUploadEnabled();
-          let recordRetentionDays: number | undefined;
-          if (recordUploadEnabled) {
-            recordRetentionDays = buildRecordRetentionDays();
-          }
-
+          const exportRetentionDays = buildExportRetentionDays();
          const buildxHistory = new BuildxHistory();
          const exportRes = await buildxHistory.export({
-            refs: stateHelper.buildRef ? [stateHelper.buildRef] : []
+            refs: [stateHelper.buildRef]
+          });
+          core.info(`Build record exported to ${exportRes.dockerbuildFilename} (${Util.formatFileSize(exportRes.dockerbuildSize)})`);
+          const uploadRes = await GitHub.uploadArtifact({
+            filename: exportRes.dockerbuildFilename,
+            mimeType: 'application/gzip',
+            retentionDays: exportRetentionDays
          });
-          core.info(`Build record written to ${exportRes.dockerbuildFilename} (${Util.formatFileSize(exportRes.dockerbuildSize)})`);
-
-          let uploadRes: UploadArtifactResponse | undefined;
-          if (recordUploadEnabled) {
-            uploadRes = await GitHub.uploadArtifact({
-              filename: exportRes.dockerbuildFilename,
-              mimeType: 'application/gzip',
-              retentionDays: recordRetentionDays
-            });
-          }
-
          await GitHub.writeBuildSummary({
            exportRes: exportRes,
            uploadRes: uploadRes,
@ -222,35 +199,11 @@ async function buildRef(toolkit: Toolkit, since: Date, builder?: string): Promis
  return Object.keys(refs).length > 0 ? Object.keys(refs)[0] : '';
 }

-function buildSummaryEnabled(): boolean {
-  if (process.env.DOCKER_BUILD_NO_SUMMARY) {
-    core.warning('DOCKER_BUILD_NO_SUMMARY is deprecated. Set DOCKER_BUILD_SUMMARY to false instead.');
-    return !Util.parseBool(process.env.DOCKER_BUILD_NO_SUMMARY);
-  } else if (process.env.DOCKER_BUILD_SUMMARY) {
-    return Util.parseBool(process.env.DOCKER_BUILD_SUMMARY);
-  }
-  return true;
-}
-
-function buildRecordUploadEnabled(): boolean {
-  if (process.env.DOCKER_BUILD_RECORD_UPLOAD) {
-    return Util.parseBool(process.env.DOCKER_BUILD_RECORD_UPLOAD);
-  }
-  return true;
-}
-
-function buildRecordRetentionDays(): number | undefined {
-  let val: string | undefined;
+function buildExportRetentionDays(): number | undefined {
  if (process.env.DOCKER_BUILD_EXPORT_RETENTION_DAYS) {
-    core.warning('DOCKER_BUILD_EXPORT_RETENTION_DAYS is deprecated. Use DOCKER_BUILD_RECORD_RETENTION_DAYS instead.');
-    val = process.env.DOCKER_BUILD_EXPORT_RETENTION_DAYS;
-  } else if (process.env.DOCKER_BUILD_RECORD_RETENTION_DAYS) {
-    val = process.env.DOCKER_BUILD_RECORD_RETENTION_DAYS;
-  }
-  if (val) {
-    const res = parseInt(val);
+    const res = parseInt(process.env.DOCKER_BUILD_EXPORT_RETENTION_DAYS);
    if (isNaN(res)) {
-      throw Error(`Invalid build record retention days: ${val}`);
+      throw Error(`Invalid build export retention days: ${process.env.DOCKER_BUILD_EXPORT_RETENTION_DAYS}`);
    }
    return res;
  }
--- a/src/state-helper.ts
+++ b/src/state-helper.ts
@ -1,11 +1,13 @@
 import * as core from '@actions/core';

+import {BuilderInfo} from '@docker/actions-toolkit/lib/types/buildx/builder';
+
 import {Inputs, sanitizeInputs} from './context';

 export const tmpDir = process.env['STATE_tmpDir'] || '';
 export const inputs = process.env['STATE_inputs'] ? JSON.parse(process.env['STATE_inputs']) : undefined;
+export const builder = process.env['STATE_builder'] ? <BuilderInfo>JSON.parse(process.env['STATE_builder']) : undefined;
 export const buildRef = process.env['STATE_buildRef'] || '';
-export const isSummarySupported = !!process.env['STATE_isSummarySupported'];

 export function setTmpDir(tmpDir: string) {
  core.saveState('tmpDir', tmpDir);
@ -15,10 +17,10 @@ export function setInputs(inputs: Inputs) {
  core.saveState('inputs', JSON.stringify(sanitizeInputs(inputs)));
 }

+export function setBuilder(builder: BuilderInfo) {
+  core.saveState('builder', JSON.stringify(builder));
+}
+
 export function setBuildRef(buildRef: string) {
  core.saveState('buildRef', buildRef);
 }
-
-export function setSummarySupported() {
-  core.saveState('isSummarySupported', 'true');
-}
--- a/yarn.lock
+++ b/yarn.lock
@ -1055,9 +1055,9 @@ __metadata:
  languageName: node
  linkType: hard

-"@docker/actions-toolkit@npm:0.31.0":
-  version: 0.31.0
-  resolution: "@docker/actions-toolkit@npm:0.31.0"
+"@docker/actions-toolkit@npm:0.28.0":
+  version: 0.28.0
+  resolution: "@docker/actions-toolkit@npm:0.28.0"
  dependencies:
    "@actions/artifact": ^2.1.7
    "@actions/cache": ^3.2.4
@ -1080,7 +1080,7 @@ __metadata:
    semver: ^7.6.2
    tar-stream: ^3.1.7
    tmp: ^0.2.3
-  checksum: 34fdc08b6380bbee05fc740b161bb1172658da6d3e58f0f9cf8bc12011da638b37314e2a92a689542955189459ace241769c9f247a6917bf8365bc461221eecd
+  checksum: 1ef7d9eb861a8f102391b9b230a6cfae808ec12f48a97b32e8afe78e241e8d4c1faece71ad8f7702c7b1cfffaf0bd7f816552b6bad0b6d8a41465142a61425a6
  languageName: node
  linkType: hard

@ -3150,7 +3150,7 @@ __metadata:
  resolution: "docker-build-push@workspace:."
  dependencies:
    "@actions/core": ^1.10.1
-    "@docker/actions-toolkit": 0.31.0
+    "@docker/actions-toolkit": 0.28.0
    "@types/node": ^20.12.12
    "@typescript-eslint/eslint-plugin": ^7.9.0
    "@typescript-eslint/parser": ^7.9.0