From 395203fa780bae8227cd8c28d655eb4d2dcbed2e Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Mon, 27 Apr 2026 11:24:01 +0000 Subject: [PATCH 1/2] chore(deps): update actions-toolkit module to 0.89.1 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/workflows/bake.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/verify.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bake.yml b/.github/workflows/bake.yml index 733676e..1d14744 100644 --- a/.github/workflows/bake.yml +++ b/.github/workflows/bake.yml @@ -158,7 +158,7 @@ env: BUILDKIT_IMAGE: "moby/buildkit:v0.29.0" SBOM_IMAGE: "docker/buildkit-syft-scanner:1.11.0" BINFMT_IMAGE: "tonistiigi/binfmt:qemu-v10.2.1-65" - DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.88.0" + DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.89.1" HANDLEBARS_MODULE: "handlebars@4.7.9" COSIGN_VERSION: "v3.0.6" LOCAL_EXPORT_DIR: "/tmp/buildx-output" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8179f9f..05cba04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,7 +161,7 @@ env: BUILDKIT_IMAGE: "moby/buildkit:v0.29.0" SBOM_IMAGE: "docker/buildkit-syft-scanner:1.11.0" BINFMT_IMAGE: "tonistiigi/binfmt:qemu-v10.2.1-65" - DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.88.0" + DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.89.1" HANDLEBARS_MODULE: "handlebars@4.7.9" COSIGN_VERSION: "v3.0.6" LOCAL_EXPORT_DIR: "/tmp/buildx-output" diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 22bb748..09ec58f 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -13,7 +13,7 @@ on: required: false env: - DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.88.0" + DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.89.1" jobs: verify: From c1fc0f6b37b5998c41a81a15615800f31a341a99 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 27 Apr 2026 12:20:47 +0200 Subject: [PATCH 2/2] build/bake: switch to compileHandlebars helper Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .github/workflows/bake.yml | 8 ++------ .github/workflows/build.yml | 9 +++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/bake.yml b/.github/workflows/bake.yml index 1d14744..9a1f6bf 100644 --- a/.github/workflows/bake.yml +++ b/.github/workflows/bake.yml @@ -159,7 +159,6 @@ env: SBOM_IMAGE: "docker/buildkit-syft-scanner:1.11.0" BINFMT_IMAGE: "tonistiigi/binfmt:qemu-v10.2.1-65" DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.89.1" - HANDLEBARS_MODULE: "handlebars@4.7.9" COSIGN_VERSION: "v3.0.6" LOCAL_EXPORT_DIR: "/tmp/buildx-output" MATRIX_SIZE_LIMIT: "20" @@ -487,15 +486,13 @@ jobs: uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 env: INPUT_DAT-MODULE: ${{ env.DOCKER_ACTIONS_TOOLKIT_MODULE }} - INPUT_HANDLEBARS-MODULE: ${{ env.HANDLEBARS_MODULE }} with: script: | await exec.exec('npm', [ 'install', '--prefer-offline', '--ignore-scripts', - core.getInput('dat-module'), - core.getInput('handlebars-module') + core.getInput('dat-module') ]); - name: Docker meta @@ -653,7 +650,6 @@ jobs: with: script: | const os = require('os'); - const Handlebars = require('handlebars'); const { Build } = require('@docker/actions-toolkit/lib/buildx/build'); const { GitHub } = require('@docker/actions-toolkit/lib/github/github'); const { Util } = require('@docker/actions-toolkit/lib/util'); @@ -690,7 +686,7 @@ jobs: version: inpMetaVersion, tags: inpMetaTags }; - const renderTemplate = value => Handlebars.compile(value, {noEscape: true})({meta}); + const renderTemplate = value => Util.compileHandlebars(value, {noEscape: true}, {meta}); const bakeSource = await new Build().gitContext({subdir: inpContext}); await core.group(`Set source output`, async () => { diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05cba04..e711b82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -162,7 +162,6 @@ env: SBOM_IMAGE: "docker/buildkit-syft-scanner:1.11.0" BINFMT_IMAGE: "tonistiigi/binfmt:qemu-v10.2.1-65" DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.89.1" - HANDLEBARS_MODULE: "handlebars@4.7.9" COSIGN_VERSION: "v3.0.6" LOCAL_EXPORT_DIR: "/tmp/buildx-output" MATRIX_SIZE_LIMIT: "20" @@ -380,15 +379,13 @@ jobs: uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 env: INPUT_DAT-MODULE: ${{ env.DOCKER_ACTIONS_TOOLKIT_MODULE }} - INPUT_HANDLEBARS-MODULE: ${{ env.HANDLEBARS_MODULE }} with: script: | await exec.exec('npm', [ 'install', '--prefer-offline', '--ignore-scripts', - core.getInput('dat-module'), - core.getInput('handlebars-module') + core.getInput('dat-module') ]); - name: Docker meta @@ -546,7 +543,7 @@ jobs: script: | const { Build } = require('@docker/actions-toolkit/lib/buildx/build'); const { GitHub } = require('@docker/actions-toolkit/lib/github/github'); - const Handlebars = require('handlebars'); + const { Util } = require('@docker/actions-toolkit/lib/util'); const inpPlatform = core.getInput('platform'); const platformPairSuffix = inpPlatform ? `-${inpPlatform.replace(/\//g, '-')}` : ''; @@ -582,7 +579,7 @@ jobs: tags: inpMetaTags }; - const renderTemplate = value => Handlebars.compile(value, {noEscape: true})({meta}); + const renderTemplate = value => Util.compileHandlebars(value, {noEscape: true}, {meta}); const toMultilineInput = value => value.split(/\r?\n/).map(line => line.trim()).filter(Boolean); const buildContext = await new Build().gitContext({subdir: inpContext});