chore: update generated content

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
         uses: actions/checkout@v6
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v7
+        uses: docker/build-push-action@v6
         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@v4
+        uses: docker/setup-buildx-action@v3
         with:
           version: ${{ env.BUILDX_VERSION }}
       -
@@ -393,7 +393,7 @@ jobs:
             type=sha
       -
         name: Build
-        uses: docker/bake-action@v7
+        uses: docker/bake-action@v6
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         with:
           version: ${{ env.BUILDX_VERSION }}
           driver: docker
@@ -462,7 +462,7 @@ jobs:
             maintainer=Foo
       -
         name: Build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         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@v4
+        uses: docker/setup-buildx-action@v3
         with:
           version: ${{ env.BUILDX_VERSION }}
       -
@@ -531,7 +531,7 @@ jobs:
           DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
       -
         name: Build
-        uses: docker/bake-action@v7
+        uses: docker/bake-action@v6
         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@v4
+        uses: docker/setup-buildx-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
         with:
           version: latest
       -
@@ -583,7 +583,7 @@ jobs:
         uses: ./
       -
         name: Build
-        uses: docker/bake-action@v7
+        uses: docker/bake-action@v6
         with:
           source: .
           files: |
@@ -607,7 +607,7 @@ jobs:
         uses: actions/checkout@v6
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
         with:
           version: ${{ env.BUILDX_VERSION }}
           driver: docker

.github/workflows/codeql.yml

@@ -1,45 +0,0 @@
-name: codeql
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'releases/v*'
-  pull_request:
-
-permissions:
-  actions: read
-  contents: read
-  security-events: write
-
-env:
-  NODE_VERSION: "24"
-
-jobs:
-  analyze:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v6
-      -
-        name: Enable corepack
-        run: |
-          corepack enable
-          yarn --version
-      -
-        name: Set up Node
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-      -
-        name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
-        with:
-          languages: javascript-typescript
-          build-mode: none
-      -
-        name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4
-        with:
-          category: "/language:javascript-typescript"

.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v6
       -
         name: Test
-        uses: docker/bake-action@v7
+        uses: docker/bake-action@v6
         with:
           source: .
           targets: test

.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@v7
+        uses: docker/bake-action@v6
         with:
           source: .
           targets: build

.github/workflows/validate.yml

@@ -15,15 +15,15 @@ jobs:
   prepare:
     runs-on: ubuntu-latest
     outputs:
-      matrix: ${{ steps.generate.outputs.matrix }}
+      targets: ${{ steps.generate.outputs.targets }}
     steps:
       -
         name: Checkout
         uses: actions/checkout@v6
       -
-        name: Generate matrix
+        name: List targets
         id: generate
-        uses: docker/bake-action/subaction/matrix@v7
+        uses: docker/bake-action/subaction/list-targets@v6
         with:
           target: validate
 
@@ -34,10 +34,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include: ${{ fromJson(needs.prepare.outputs.matrix) }}
+        target: ${{ fromJson(needs.prepare.outputs.targets) }}
     steps:
       -
         name: Validate
-        uses: docker/bake-action@v7
+        uses: docker/bake-action@v6
         with:
           targets: ${{ matrix.target }}

README.md

@@ -75,23 +75,27 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v6
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: name/app
       -
         name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
+          context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -125,10 +129,13 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v6
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             name/app
@@ -140,14 +147,15 @@ jobs:
       -
         name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
+          context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -202,7 +210,7 @@ jobs:
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             name/app
@@ -214,7 +222,7 @@ jobs:
             type=sha
       -
         name: Build
-        uses: docker/bake-action@v7
+        uses: docker/bake-action@v6
         with:
           files: |
             ./docker-bake.hcl
@@ -261,7 +269,7 @@ similar to the previous one:
 ```yaml
       -
         name: Build
-        uses: docker/bake-action@v7
+        uses: docker/bake-action@v6
         with:
           files: |
             ./docker-bake.hcl
@@ -328,7 +336,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@v7
+- uses: docker/build-push-action@v6
   with:
     build-args: |
       DOCKER_METADATA_OUTPUT_JSON
@@ -720,7 +728,7 @@ increase this length for larger repositories by setting the
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             name/app
@@ -931,13 +939,13 @@ that you can reuse them further in your workflow using the [`fromJSON` function]
 ```yaml
       -
         name: Docker meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         id: meta
         with:
           images: name/app
       -
         name: Build and push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -957,7 +965,7 @@ this:
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: name/app
           labels: |
@@ -979,12 +987,12 @@ of the `metadata-action`:
 ```yaml
       -
         name: Docker meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: name/app
       -
         name: Build and push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           tags: ${{ steps.meta.outputs.tags }}
           annotations: ${{ steps.meta.outputs.annotations }}
@@ -995,12 +1003,12 @@ The same can be done with the [`bake-action`](https://github.com/docker/bake-act
 ```yaml
       -
         name: Docker meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: name/app
       -
         name: Build
-        uses: docker/bake-action@v7
+        uses: docker/bake-action@v6
         with:
           files: |
             ./docker-bake.hcl
@@ -1024,14 +1032,14 @@ Please consult the documentation of your registry.
 ```yaml
       -
         name: Docker meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: name/app
         env:
           DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
       -
         name: Build and push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           tags: ${{ steps.meta.outputs.tags }}
           annotations: ${{ steps.meta.outputs.annotations }}

__tests__/context.test.ts

@@ -79,67 +79,6 @@ describe('getInputs', () => {
         tags: [],
       }
     ],
-    [
-      3,
-      new Map<string, string>([
-        ['labels', 'mylabel=foo#bar\n#comment\nanother=bar'],
-      ]),
-      {
-        context: context.ContextSource.workflow,
-        bakeTarget: 'docker-metadata-action',
-        flavor: [],
-        githubToken: '',
-        images: [],
-        labels: ['mylabel=foo#bar', 'another=bar'],
-        annotations: [],
-        sepLabels: '\n',
-        sepTags: '\n',
-        sepAnnotations: '\n',
-        tags: [],
-      }
-    ],
-    [
-      4,
-      new Map<string, string>([
-        ['annotations', 'org.opencontainers.image.url=https://example.com/path#readme\n#comment\norg.opencontainers.image.source=https://github.com/docker/metadata-action'],
-      ]),
-      {
-        context: context.ContextSource.workflow,
-        bakeTarget: 'docker-metadata-action',
-        flavor: [],
-        githubToken: '',
-        images: [],
-        labels: [],
-        annotations: [
-          'org.opencontainers.image.url=https://example.com/path#readme',
-          'org.opencontainers.image.source=https://github.com/docker/metadata-action'
-        ],
-        sepLabels: '\n',
-        sepTags: '\n',
-        sepAnnotations: '\n',
-        tags: [],
-      }
-    ],
-    [
-      5,
-      new Map<string, string>([
-        ['tags', 'type=raw,value=foo#bar\n#comment'],
-        ['flavor', 'prefix=v#1\n#comment'],
-      ]),
-      {
-        context: context.ContextSource.workflow,
-        bakeTarget: 'docker-metadata-action',
-        flavor: ['prefix=v#1'],
-        githubToken: '',
-        images: [],
-        labels: [],
-        annotations: [],
-        sepLabels: '\n',
-        sepTags: '\n',
-        sepAnnotations: '\n',
-        tags: ['type=raw,value=foo#bar'],
-      }
-    ],
   ];
   test.each(cases)('[%d] given %o as inputs, returns %o', async (num: number, inputs: Map<string, string>, expected: context.Inputs) => {
     inputs.forEach((value: string, name: string) => {

action.yml

@@ -66,5 +66,5 @@ outputs:
     description: 'Bake definition file with tags and labels'
 
 runs:
-  using: 'node24'
+  using: 'node20'
   main: 'dist/index.js'

dev.Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG NODE_VERSION=24
+ARG NODE_VERSION=20
 
 FROM node:${NODE_VERSION}-alpine AS base
 RUN apk add --no-cache cpio findutils git rsync

package.json

@@ -26,17 +26,17 @@
   "dependencies": {
     "@actions/core": "^3.0.0",
     "@actions/github": "^9.0.0",
-    "@docker/actions-toolkit": "^0.79.0",
+    "@docker/actions-toolkit": "^0.77.0",
     "@renovate/pep440": "^1.0.0",
     "csv-parse": "^6.1.0",
     "handlebars": "^4.7.8",
     "moment": "^2.30.1",
-    "moment-timezone": "^0.6.1",
+    "moment-timezone": "^0.6.0",
     "semver": "^7.7.4"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.3",
-    "@types/node": "^24.11.0",
+    "@types/node": "^20.19.35",
     "@types/semver": "^7.7.1",
     "@typescript-eslint/eslint-plugin": "^8.56.1",
     "@typescript-eslint/parser": "^8.56.1",

src/context.ts

@@ -28,11 +28,11 @@ export interface Inputs {
 export function getInputs(): Inputs {
   return {
     context: (core.getInput('context') || ContextSource.workflow) as ContextSource,
-    images: Util.getInputList('images', {ignoreComma: true, comment: '#', commentNoInfix: true}),
-    tags: Util.getInputList('tags', {ignoreComma: true, comment: '#', commentNoInfix: true}),
-    flavor: Util.getInputList('flavor', {ignoreComma: true, comment: '#', commentNoInfix: true}),
-    labels: Util.getInputList('labels', {ignoreComma: true, comment: '#', commentNoInfix: true}),
-    annotations: Util.getInputList('annotations', {ignoreComma: true, comment: '#', commentNoInfix: true}),
+    images: Util.getInputList('images', {ignoreComma: true, comment: '#'}),
+    tags: Util.getInputList('tags', {ignoreComma: true, comment: '#'}),
+    flavor: Util.getInputList('flavor', {ignoreComma: true, comment: '#'}),
+    labels: Util.getInputList('labels', {ignoreComma: true, comment: '#'}),
+    annotations: Util.getInputList('annotations', {ignoreComma: true, comment: '#'}),
     sepTags: core.getInput('sep-tags', {trimWhitespace: false}) || `\n`,
     sepLabels: core.getInput('sep-labels', {trimWhitespace: false}) || `\n`,
     sepAnnotations: core.getInput('sep-annotations', {trimWhitespace: false}) || `\n`,

yarn.lock

@@ -376,9 +376,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@docker/actions-toolkit@npm:^0.79.0":
-  version: 0.79.0
-  resolution: "@docker/actions-toolkit@npm:0.79.0"
+"@docker/actions-toolkit@npm:^0.77.0":
+  version: 0.77.0
+  resolution: "@docker/actions-toolkit@npm:0.77.0"
   dependencies:
     "@actions/artifact": "npm:^6.2.0"
     "@actions/cache": "npm:^6.0.0"
@@ -402,7 +402,7 @@ __metadata:
     semver: "npm:^7.7.4"
     tar-stream: "npm:^3.1.7"
     tmp: "npm:^0.2.5"
-  checksum: 10/d64849ba49b2b59e2e93237a70be03fd7c43b1f7f01bac3f7557616ba5f59be785cb12a273bbb6a71c1e0d959f1bc6c673111b587c57bd2d6da105dcc500921a
+  checksum: 10/f3ae817a5a6827efc63d1a1730e918801a8fa33867cda72bd7a1f78309631c45d91de60bc57985c7520fae168e96daed0fcab0003b5fab9b50bdd7aa355d651b
   languageName: node
   linkType: hard
 
@@ -1325,12 +1325,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^24.11.0":
-  version: 24.11.0
-  resolution: "@types/node@npm:24.11.0"
+"@types/node@npm:^20.19.35":
+  version: 20.19.35
+  resolution: "@types/node@npm:20.19.35"
   dependencies:
-    undici-types: "npm:~7.16.0"
-  checksum: 10/d2f4f898c6a0f14980e55c697904fb58681729fc46b4e264d5f64dc391b23da73c9b422cfffbca28c045e6e8eca72dab5f28ed633faa95398ef1528af5398382
+    undici-types: "npm:~6.21.0"
+  checksum: 10/f14fa74f9ae4d1109d8a8e3ec31b6518122b3d31c28fd5725cb3eef8ff64d7cf6f8da9c84c78b512e2968006ec325c82a413cc2062da7b3c3230c882e88babba
   languageName: node
   linkType: hard
 
@@ -2142,10 +2142,10 @@ __metadata:
   dependencies:
     "@actions/core": "npm:^3.0.0"
     "@actions/github": "npm:^9.0.0"
-    "@docker/actions-toolkit": "npm:^0.79.0"
+    "@docker/actions-toolkit": "npm:^0.77.0"
     "@eslint/js": "npm:^9.39.3"
     "@renovate/pep440": "npm:^1.0.0"
-    "@types/node": "npm:^24.11.0"
+    "@types/node": "npm:^20.19.35"
     "@types/semver": "npm:^7.7.1"
     "@typescript-eslint/eslint-plugin": "npm:^8.56.1"
     "@typescript-eslint/parser": "npm:^8.56.1"
@@ -2160,7 +2160,7 @@ __metadata:
     globals: "npm:^17.3.0"
     handlebars: "npm:^4.7.8"
     moment: "npm:^2.30.1"
-    moment-timezone: "npm:^0.6.1"
+    moment-timezone: "npm:^0.6.0"
     prettier: "npm:^3.8.1"
     semver: "npm:^7.7.4"
     typescript: "npm:^5.9.3"
@@ -3511,12 +3511,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment-timezone@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "moment-timezone@npm:0.6.1"
+"moment-timezone@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "moment-timezone@npm:0.6.0"
   dependencies:
     moment: "npm:^2.29.4"
-  checksum: 10/20a80969712e35cab0ccda1cebe6fd768201bc1c9aa4528881bb8dd352bfcae2564546bf634ee7768aafd1dabb8054982964590084a1af8feab0574dd1d3ea3e
+  checksum: 10/324df65c9ed622c75d4e39dc5daf01dfcd8b4cb4eb63dec3270ddbfed3f5357e4d4b22a39bf3b4fe1fe2d78b21307abddfb13e7aa6a19b69b7f33bb712c8ad55
   languageName: node
   linkType: hard
 
@@ -4521,10 +4521,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"undici-types@npm:~7.16.0":
-  version: 7.16.0
-  resolution: "undici-types@npm:7.16.0"
-  checksum: 10/db43439f69c2d94cc29f75cbfe9de86df87061d6b0c577ebe9bb3255f49b22c50162a7d7eb413b0458b6510b8ca299ac7cff38c3a29fbd31af9f504bcf7fbc0d
+"undici-types@npm:~6.21.0":
+  version: 6.21.0
+  resolution: "undici-types@npm:6.21.0"
+  checksum: 10/ec8f41aa4359d50f9b59fa61fe3efce3477cc681908c8f84354d8567bb3701fafdddf36ef6bff307024d3feb42c837cf6f670314ba37fc8145e219560e473d14
   languageName: node
   linkType: hard