diff --git a/.github/workflows/bake.yml b/.github/workflows/bake.yml index 733676e..9a1f6bf 100644 --- a/.github/workflows/bake.yml +++ b/.github/workflows/bake.yml @@ -158,8 +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" - HANDLEBARS_MODULE: "handlebars@4.7.9" + DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.89.1" 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 8179f9f..e711b82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,8 +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" - HANDLEBARS_MODULE: "handlebars@4.7.9" + DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.89.1" 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}); 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: