Merge pull request #475 from crazy-max/commit-date-changes

commit_date: code cleanup and readme updates

.dockerignore

@@ -1,2 +1,12 @@
 /coverage
-/node_modules
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*

.eslintrc.json

@@ -13,7 +13,7 @@
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "ecmaVersion": "latest",
+    "ecmaVersion": 2023,
     "sourceType": "module"
   },
   "plugins": [

.gitattributes

@@ -1,3 +1,5 @@
+/.yarn/releases/** binary
+/.yarn/plugins/** binary
 /__tests__/fixtures/** -linguist-detectable
 /dist/** linguist-generated=true
 /lib/** linguist-generated=true

.github/workflows/ci.yml

@@ -17,14 +17,39 @@ on:
 
 env:
   DOCKER_IMAGE: localhost:5000/name/app
+  BUILDX_VERSION: latest
 
 jobs:
+  context:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        context:
+          - workflow
+          - git
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Docker meta
+        uses: ./
+        with:
+          context: ${{ matrix.context }}
+
   multi-images:
     runs-on: ubuntu-latest
     steps:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         uses: ./
@@ -56,6 +81,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         uses: ./
@@ -86,6 +117,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         uses: ./
@@ -114,6 +151,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         uses: ./
@@ -139,6 +182,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         uses: ./
@@ -156,6 +205,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         uses: ./
@@ -171,6 +226,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         uses: ./
@@ -195,6 +256,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         uses: ./
@@ -216,6 +283,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         id: meta
@@ -245,6 +318,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver-opts: network=host
       -
         name: Docker meta
         id: docker_meta
@@ -261,17 +340,9 @@ jobs:
             type=semver,pattern=v{{major}}.{{minor}}
             type=semver,pattern=v{{major}}
             type=sha
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: network=host
       -
         name: Build and push to local registry
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./test
           file: ./test/Dockerfile
@@ -288,10 +359,6 @@ jobs:
         name: Check manifest
         run: |
           docker buildx imagetools inspect ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }}
-      -
-        name: Dump context
-        if: always()
-        uses: crazy-max/ghaction-dump-context@v2
 
   bake:
     runs-on: ubuntu-latest
@@ -299,6 +366,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
       -
         name: Docker meta
         id: docker_meta
@@ -316,15 +388,9 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           files: |
             ./test/docker-bake.hcl
@@ -345,6 +411,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         id: meta
@@ -367,6 +439,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         id: meta
@@ -381,7 +459,7 @@ jobs:
             maintainer=Foo
       -
         name: Build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./test
           file: ./test/output.Dockerfile
@@ -398,6 +476,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
       -
         name: Docker meta
         id: docker_meta
@@ -417,17 +500,9 @@ jobs:
             type=sha
         env:
           DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: v0.12.0-rc1
       -
         name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           files: |
             ./test/docker-bake.hcl
@@ -442,6 +517,12 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
       -
         name: Docker meta
         uses: ./
@@ -455,3 +536,70 @@ jobs:
       -
         name: Print envs
         run: env|sort
+
+  bake-cwd:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: latest
+      -
+        name: Docker meta
+        id: docker_meta
+        uses: ./
+      -
+        name: Build
+        uses: docker/bake-action@v5
+        with:
+          source: "{{defaultContext}}"
+          files: |
+            ./test/docker-bake.hcl
+            cwd://${{ steps.docker_meta.outputs.bake-file-tags }}
+            cwd://${{ steps.docker_meta.outputs.bake-file-labels }}
+          targets: |
+            release
+
+  sha-short:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        short-length:
+          - ''
+          - 16
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: ${{ env.BUILDX_VERSION }}
+          driver: docker
+      -
+        name: Docker meta
+        uses: ./
+        with:
+          images: |
+            ${{ env.DOCKER_IMAGE }}
+            ghcr.io/name/app
+          tags: |
+            type=sha
+        env:
+          DOCKER_METADATA_SHORT_SHA_LENGTH: ${{ matrix.short-length }}
+
+  dump:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Dump context
+        uses: crazy-max/ghaction-dump-context@v2

.github/workflows/publish.yml

@@ -0,0 +1,21 @@
+name: publish
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+      packages: write
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Publish
+        uses: actions/publish-immutable-action@v0.0.4

.github/workflows/test.yml

@@ -20,11 +20,12 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Test
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           targets: test
       -
         name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           file: ./coverage/clover.xml
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/validate.yml

@@ -40,6 +40,6 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Validate
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           targets: ${{ matrix.target }}

.gitignore

@@ -1,12 +1,5 @@
-/.dev
+# https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore
-node_modules/
-lib
 
-# Jetbrains
-/.idea
-/*.iml
-
-# Rest of the file pulled from https://github.com/github/gitignore/blob/master/Node.gitignore
 # Logs
 logs
 *.log
@@ -14,6 +7,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
+.pnpm-debug.log*
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
@@ -24,34 +18,14 @@ pids
 *.seed
 *.pid.lock
 
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
 # Coverage directory used by tools like istanbul
 coverage
 *.lcov
 
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
 # Dependency directories
+node_modules/
 jspm_packages/
 
-# TypeScript v1 declaration files
-typings/
-
 # TypeScript cache
 *.tsbuildinfo
 
@@ -61,36 +35,19 @@ typings/
 # Optional eslint cache
 .eslintcache
 
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
 # Yarn Integrity file
 .yarn-integrity
 
-# dotenv environment variables file
+# dotenv environment variable files
 .env
-.env.test
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
 
-# parcel-bundler cache (https://parceljs.org/)
+# yarn v2
-.cache
+.yarn/cache
-
+.yarn/unplugged
-# next.js build output
+.yarn/build-state.yml
-.next
+.yarn/install-state.gz
-
+.pnp.*
-# nuxt.js build output
-.nuxt
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/

.prettierignore

@@ -0,0 +1,6 @@
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# yarn v2
+.yarn/

.yarnrc.yml

@@ -0,0 +1,13 @@
+logFilters:
+  - code: YN0013
+    level: discard
+  - code: YN0019
+    level: discard
+  - code: YN0076
+    level: discard
+
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"

README.md

@@ -45,6 +45,7 @@ ___
     * [`{{base_ref}}`](#base_ref)
     * [`{{is_default_branch}}`](#is_default_branch)
     * [`{{date '<format>' tz='<timezone>'}}`](#date-format-tztimezone)
+    * [`{{commit_date '<format>' tz='<timezone>'}}`](#commit_date-format-tztimezone)
   * [Major version zero](#major-version-zero)
   * [JSON output object](#json-output-object)
   * [Overwrite labels and annotations](#overwrite-labels-and-annotations)
@@ -223,7 +224,7 @@ jobs:
             type=sha
       -
         name: Build
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: |
             ./docker-bake.hcl
@@ -270,7 +271,7 @@ similar to the previous one:
 ```yaml
       -
         name: Build
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: |
             ./docker-bake.hcl
@@ -279,6 +280,23 @@ similar to the previous one:
           targets: build
 ```
 
+If you're building a [remote Bake definition](https://docs.docker.com/build/bake/remote-definition/)
+using a [Git context](https://github.com/docker/bake-action?tab=readme-ov-file#git-context),
+you must specify the location of the metadata-only bake file using a `cwd://`
+prefix:
+
+```yaml
+      -
+        name: Build
+        uses: docker/bake-action@v4
+        with:
+          source: "${{ github.server_url }}/${{ github.repository }}.git#${{ github.ref }}"
+          files: |
+            ./docker-bake.hcl
+            cwd://${{ steps.meta.outputs.bake-file }}
+          targets: build
+```
+
 ## Customizing
 
 ### inputs
@@ -343,10 +361,11 @@ So it can be used with our [Docker Build Push action](https://github.com/docker/
 
 ### environment variables
 
-| Name                                 | Type   | Description                                                                                                |
+| Name                                 | Type   | Description                                                                                                                                   |
-|--------------------------------------|--------|------------------------------------------------------------------------------------------------------------|
+|--------------------------------------|--------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| `DOCKER_METADATA_PR_HEAD_SHA`        | Bool   | If `true`, set associated head SHA instead of commit SHA that triggered the workflow on pull request event |
+| `DOCKER_METADATA_PR_HEAD_SHA`        | Bool   | If `true`, set associated head SHA instead of commit SHA that triggered the workflow on pull request event                                    |
-| `DOCKER_METADATA_ANNOTATIONS_LEVELS` | String | Comma separated list of annotations levels to set for annotations output separated (default `manifest`)    |
+| `DOCKER_METADATA_SHORT_SHA_LENGTH`   | Number | Specifies the length of the [short commit SHA](#typesha) to ensure uniqueness. Default is `12`, but can be increased for larger repositories. |
+| `DOCKER_METADATA_ANNOTATIONS_LEVELS` | String | Comma separated list of annotations levels to set for annotations output separated (default `manifest`)                                       |
 
 ## `context` input
 
@@ -705,7 +724,26 @@ tags: |
   type=sha,format=long
 ```
 
-Output Git short commit (or long if specified) as Docker tag like `sha-ad132f5`.
+Output Git short commit (or long if specified) as Docker tag like
+`sha-860c1904a1ce`.
+
+By default, the length of the short commit SHA is `12` characters. You can
+increase this length for larger repositories by setting the
+[`DOCKER_METADATA_SHORT_SHA_LENGTH` environment variable](#environment-variables):
+
+```yaml
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            name/app
+          tags: |
+            type=sha
+        env:
+          DOCKER_METADATA_SHORT_SHA_LENGTH: 16
+```
 
 Extended attributes and default values:
 
@@ -852,6 +890,20 @@ Default `tz` is UTC.
 | `{{date 'dddd, MMMM Do YYYY, h:mm:ss a'}}`   | `Friday, January 10th 2020, 3:25:50 pm` |
 | `{{date 'YYYYMMDD-HHmmss' tz='Asia/Tokyo'}}` | `20200110-093000`                       |
 
+#### `{{commit_date '<format>' tz='<timezone>'}}`
+
+Returns the date when the current git commit is committed, rendered by its
+[moment format](https://momentjs.com/docs/#/displaying/format/). It falls back
+to the current date if the commit date is not available.
+
+Default `tz` is UTC.
+
+| Expression                                          | Output example                          |
+|-----------------------------------------------------|-----------------------------------------|
+| `{{commit_date 'YYYYMMDD'}}`                        | `20200110`                              |
+| `{{commit_date 'dddd, MMMM Do YYYY, h:mm:ss a'}}`   | `Friday, January 10th 2020, 3:25:50 pm` |
+| `{{commit_date 'YYYYMMDD-HHmmss' tz='Asia/Tokyo'}}` | `20200110-093000`                       |
+
 ### Major version zero
 
 Major version zero (`0.y.z`) is for initial development and **may** change at
@@ -948,7 +1000,7 @@ The same can be done with the [`bake-action`](https://github.com/docker/bake-act
           images: name/app
       -
         name: Build
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: |
             ./docker-bake.hcl

__mocks__/@actions/github.ts

@@ -204,4 +204,6 @@ export const context = {
   }
 };
 
-export const getOctokit = jest.fn();
+export const getOctokit = jest.fn(() => ({
+  request: () => Promise.resolve({data: {committer: {date: '2024-11-13T13:42:28Z'}}})
+}));

__tests__/context.test.ts

@@ -5,9 +5,12 @@ import * as path from 'path';
 import {Context} from '@actions/github/lib/context';
 import {Git} from '@docker/actions-toolkit/lib/git';
 import {GitHub} from '@docker/actions-toolkit/lib/github';
+import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
 
 import {ContextSource, getContext, getInputs, Inputs} from '../src/context';
 
+const toolkit = new Toolkit({githubToken: 'fake-github-token'});
+
 beforeEach(() => {
   jest.clearAllMocks();
   jest.spyOn(GitHub, 'context', 'get').mockImplementation((): Context => {
@@ -113,9 +116,10 @@ describe('getContext', () => {
   });
 
   it('workflow', async () => {
-    const context = await getContext(ContextSource.workflow);
+    const context = await getContext(ContextSource.workflow, toolkit);
     expect(context.ref).toEqual('refs/heads/dev');
     expect(context.sha).toEqual('5f3331d7f7044c18ca9f12c77d961c4d7cf3276a');
+    expect(context.commitDate).toEqual(new Date('2024-11-13T13:42:28.000Z'));
   });
 
   it('git', async () => {
@@ -125,9 +129,13 @@ describe('getContext', () => {
         sha: 'git-test-sha'
       } as Context);
     });
-    const context = await getContext(ContextSource.git);
+    jest.spyOn(Git, 'commitDate').mockImplementation(async (): Promise<Date> => {
+      return new Date('2023-01-01T13:42:28.000Z');
+    });
+    const context = await getContext(ContextSource.git, toolkit);
     expect(context.ref).toEqual('refs/heads/git-test');
     expect(context.sha).toEqual('git-test-sha');
+    expect(context.commitDate).toEqual(new Date('2023-01-01T13:42:28.000Z'));
   });
 });
 

__tests__/meta.test.ts

@@ -2,10 +2,11 @@ import {beforeEach, describe, expect, jest, test} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as dotenv from 'dotenv';
+
+import {Context} from '@actions/github/lib/context';
 import {GitHub} from '@docker/actions-toolkit/lib/github';
 import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
 import {GitHubRepo} from '@docker/actions-toolkit/lib/types/github';
-import {Context} from '@actions/github/lib/context';
 
 import {ContextSource, getContext, getInputs, Inputs} from '../src/context';
 import {Meta, Version} from '../src/meta';
@@ -31,8 +32,16 @@ beforeEach(() => {
       delete process.env[key];
     }
   });
+
   jest.spyOn(GitHub, 'context', 'get').mockImplementation((): Context => {
-    return new Context();
+    //@ts-expect-error partial info
+    return {
+      ...new Context(),
+      repo: {
+        owner: 'docker',
+        repo: 'repo'
+      }
+    };
   });
 });
 
@@ -53,7 +62,7 @@ const tagsLabelsTest = async (name: string, envFile: string, inputs: Inputs, exV
   process.env = dotenv.parse(fs.readFileSync(path.join(__dirname, 'fixtures', envFile)));
   const toolkit = new Toolkit();
   const repo = await toolkit.github.repoData();
-  const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow), repo);
+  const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow, toolkit), repo);
 
   const version = meta.version;
   expect(version).toEqual(exVersion);
@@ -310,14 +319,14 @@ describe('push', () => {
       } as Inputs,
       {
         main: 'dev',
-        partial: ['sha-860c190'],
+        partial: ['sha-860c1904a1ce'],
         latest: false
       } as Version,
       [
         'org/app:dev',
-        'org/app:sha-860c190',
+        'org/app:sha-860c1904a1ce',
         'ghcr.io/user/app:dev',
-        'ghcr.io/user/app:sha-860c190'
+        'ghcr.io/user/app:sha-860c1904a1ce'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -343,14 +352,14 @@ describe('push', () => {
       } as Inputs,
       {
         main: 'edge',
-        partial: ['sha-2665741'],
+        partial: ['sha-266574110acf'],
         latest: false
       } as Version,
       [
         'org/app:edge',
-        'org/app:sha-2665741',
+        'org/app:sha-266574110acf',
         'ghcr.io/user/app:edge',
-        'ghcr.io/user/app:sha-2665741'
+        'ghcr.io/user/app:sha-266574110acf'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -376,14 +385,14 @@ describe('push', () => {
       } as Inputs,
       {
         main: 'edge',
-        partial: ['sha-860c190'],
+        partial: ['sha-860c1904a1ce'],
         latest: false
       } as Version,
       [
         'org/app:edge',
-        'org/app:sha-860c190',
+        'org/app:sha-860c1904a1ce',
         'ghcr.io/user/app:edge',
-        'ghcr.io/user/app:sha-860c190'
+        'ghcr.io/user/app:sha-860c1904a1ce'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -408,13 +417,13 @@ describe('push', () => {
         ],
       } as Inputs,
       {
-        main: 'sha-2665741',
+        main: 'sha-266574110acf',
         partial: [],
         latest: false
       } as Version,
       [
-        'org/app:sha-2665741',
+        'org/app:sha-266574110acf',
-        'ghcr.io/user/app:sha-2665741'
+        'ghcr.io/user/app:sha-266574110acf'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -424,7 +433,7 @@ describe('push', () => {
         "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
         "org.opencontainers.image.title=Hello-World",
         "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
-        "org.opencontainers.image.version=sha-2665741"
+        "org.opencontainers.image.version=sha-266574110acf"
       ],
       undefined
     ],
@@ -439,13 +448,13 @@ describe('push', () => {
         ],
       } as Inputs,
       {
-        main: 'sha-983315b',
+        main: 'sha-983315b5e8d4',
         partial: [],
         latest: false
       } as Version,
       [
-        'org/app:sha-983315b',
+        'org/app:sha-983315b5e8d4',
-        'ghcr.io/user/app:sha-983315b'
+        'ghcr.io/user/app:sha-983315b5e8d4'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -455,7 +464,7 @@ describe('push', () => {
         "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
         "org.opencontainers.image.title=Hello-World",
         "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
-        "org.opencontainers.image.version=sha-983315b"
+        "org.opencontainers.image.version=sha-983315b5e8d4"
       ],
       undefined
     ],
@@ -622,6 +631,7 @@ describe('push', () => {
         tags: [
           `type=raw,value=mytag-{{branch}}`,
           `type=raw,value=mytag-{{date 'YYYYMMDD'}}`,
+          `type=raw,value=mytag-cd-{{commit_date 'YYYYMMDD'}}`,
           `type=raw,value=mytag-{{date 'YYYYMMDD-HHmmss' tz='Asia/Tokyo'}}`,
           `type=raw,value=mytag-tag-{{tag}}`,
           `type=raw,value=mytag-baseref-{{base_ref}}`,
@@ -632,6 +642,7 @@ describe('push', () => {
         main: 'mytag-master',
         partial: [
           'mytag-20200110',
+          "mytag-cd-20200110",
           'mytag-20200110-093000',
           'mytag-tag-',
           'mytag-baseref-',
@@ -642,6 +653,7 @@ describe('push', () => {
       [
         'user/app:mytag-master',
         'user/app:mytag-20200110',
+        'user/app:mytag-cd-20200110',
         'user/app:mytag-20200110-093000',
         'user/app:mytag-tag-',
         'user/app:mytag-baseref-',
@@ -768,6 +780,7 @@ describe('push', () => {
           `type=raw,value=mytag-{{branch}}`,
           `type=raw,value=mytag-{{date 'YYYYMMDD'}}`,
           `type=raw,value=mytag-{{date 'YYYYMMDD-HHmmss' tz='Asia/Tokyo'}}`,
+          `type=raw,value=mytag-src-{{commit_date 'YYYYMMDD'}}`,
           `type=raw,value=mytag-tag-{{tag}}`,
           `type=raw,value=mytag-baseref-{{base_ref}}`,
           `type=raw,value=mytag-defbranch,enable={{is_default_branch}}`
@@ -778,6 +791,7 @@ describe('push', () => {
         partial: [
           'mytag-20200110',
           'mytag-20200110-093000',
+          'mytag-src-20200110',
           'mytag-tag-',
           'mytag-baseref-',
           'mytag-defbranch'
@@ -788,6 +802,7 @@ describe('push', () => {
         'mytag-master',
         'mytag-20200110',
         'mytag-20200110-093000',
+        'mytag-src-20200110',
         'mytag-tag-',
         'mytag-baseref-',
         'mytag-defbranch'
@@ -1341,17 +1356,17 @@ describe('tag', () => {
       } as Inputs,
       {
         main: '1.0.0',
-        partial: ['1.0', 'sha-860c190'],
+        partial: ['1.0', 'sha-860c1904a1ce'],
         latest: true
       } as Version,
       [
         'org/app:1.0.0',
         'org/app:1.0',
-        'org/app:sha-860c190',
+        'org/app:sha-860c1904a1ce',
         'org/app:latest',
         'ghcr.io/user/app:1.0.0',
         'ghcr.io/user/app:1.0',
-        'ghcr.io/user/app:sha-860c190',
+        'ghcr.io/user/app:sha-860c1904a1ce',
         'ghcr.io/user/app:latest'
       ],
       [
@@ -1381,17 +1396,17 @@ describe('tag', () => {
       } as Inputs,
       {
         main: '1.0.0',
-        partial: ['1.0', 'sha-860c190'],
+        partial: ['1.0', 'sha-860c1904a1ce'],
         latest: true
       } as Version,
       [
         'org/app:1.0.0',
         'org/app:1.0',
-        'org/app:sha-860c190',
+        'org/app:sha-860c1904a1ce',
         'org/app:latest',
         'ghcr.io/user/app:1.0.0',
         'ghcr.io/user/app:1.0',
-        'ghcr.io/user/app:sha-860c190',
+        'ghcr.io/user/app:sha-860c1904a1ce',
         'ghcr.io/user/app:latest'
       ],
       [
@@ -1423,17 +1438,17 @@ describe('tag', () => {
       } as Inputs,
       {
         main: '1.0.0-dev',
-        partial: ['1.0', 'sha-860c190-dev'],
+        partial: ['1.0', 'sha-860c1904a1ce-dev'],
         latest: true
       } as Version,
       [
         'org/app:1.0.0-dev',
         'org/app:1.0',
-        'org/app:sha-860c190-dev',
+        'org/app:sha-860c1904a1ce-dev',
         'org/app:latest',
         'ghcr.io/user/app:1.0.0-dev',
         'ghcr.io/user/app:1.0',
-        'ghcr.io/user/app:sha-860c190-dev',
+        'ghcr.io/user/app:sha-860c1904a1ce-dev',
         'ghcr.io/user/app:latest'
       ],
       [
@@ -1460,16 +1475,16 @@ describe('tag', () => {
         ]
       } as Inputs,
       {
-        main: 'v1.1.1-860c190-foo',
+        main: 'v1.1.1-860c1904a1ce-foo',
         partial: [
           'master-foo'
         ],
         latest: false
       } as Version,
       [
-        'org/app:v1.1.1-860c190-foo',
+        'org/app:v1.1.1-860c1904a1ce-foo',
         'org/app:master-foo',
-        'ghcr.io/user/app:v1.1.1-860c190-foo',
+        'ghcr.io/user/app:v1.1.1-860c1904a1ce-foo',
         'ghcr.io/user/app:master-foo'
       ],
       [
@@ -1480,7 +1495,7 @@ describe('tag', () => {
         "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
         "org.opencontainers.image.title=Hello-World",
         "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
-        "org.opencontainers.image.version=v1.1.1-860c190-foo"
+        "org.opencontainers.image.version=v1.1.1-860c1904a1ce-foo"
       ],
       undefined
     ],
@@ -2334,14 +2349,14 @@ describe('pr', () => {
       } as Inputs,
       {
         main: 'pr-15',
-        partial: ['sha-a9c8c58'],
+        partial: ['sha-a9c8c5828b91'],
         latest: false
       } as Version,
       [
         'org/app:pr-15',
-        'org/app:sha-a9c8c58',
+        'org/app:sha-a9c8c5828b91',
         'ghcr.io/user/app:pr-15',
-        'ghcr.io/user/app:sha-a9c8c58'
+        'ghcr.io/user/app:sha-a9c8c5828b91'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -2366,14 +2381,14 @@ describe('pr', () => {
         ]
       } as Inputs,
       {
-        main: 'sha-a9c8c58',
+        main: 'sha-a9c8c5828b91',
         partial: ['pr-15'],
         latest: false
       } as Version,
       [
-        'org/app:sha-a9c8c58',
+        'org/app:sha-a9c8c5828b91',
         'org/app:pr-15',
-        'ghcr.io/user/app:sha-a9c8c58',
+        'ghcr.io/user/app:sha-a9c8c5828b91',
         'ghcr.io/user/app:pr-15'
       ],
       [
@@ -2384,7 +2399,7 @@ describe('pr', () => {
         "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
         "org.opencontainers.image.title=Hello-World",
         "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
-        "org.opencontainers.image.version=sha-a9c8c58"
+        "org.opencontainers.image.version=sha-a9c8c5828b91"
       ],
       undefined
     ],
@@ -2467,14 +2482,14 @@ describe('pr', () => {
         ]
       } as Inputs,
       {
-        main: 'sha-2665741',
+        main: 'sha-266574110acf',
         partial: ['pr-15'],
         latest: false
       } as Version,
       [
-        'org/app:sha-2665741',
+        'org/app:sha-266574110acf',
         'org/app:pr-15',
-        'ghcr.io/user/app:sha-2665741',
+        'ghcr.io/user/app:sha-266574110acf',
         'ghcr.io/user/app:pr-15'
       ],
       [
@@ -2485,7 +2500,7 @@ describe('pr', () => {
         "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
         "org.opencontainers.image.title=Hello-World",
         "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
-        "org.opencontainers.image.version=sha-2665741"
+        "org.opencontainers.image.version=sha-266574110acf"
       ],
       undefined
     ],
@@ -2539,14 +2554,14 @@ describe('pr', () => {
       {
         main: 'pr-15',
         partial: [
-          'sha-2665741',
+          'sha-266574110acf',
           'sha-266574110acf203503badf966df2ea24b5d732d7'
         ],
         latest: false
       } as Version,
       [
         'org/app:pr-15',
-        'org/app:sha-2665741',
+        'org/app:sha-266574110acf',
         'org/app:sha-266574110acf203503badf966df2ea24b5d732d7'
       ],
       [
@@ -2621,6 +2636,35 @@ describe('pr', () => {
       ],
       undefined
     ],
+    [
+      'pr12',
+      'event_pull_request.env',
+      {
+        images: ['org/app'],
+        tags: [
+          `type=raw,value={{commit_date YYYY-MM-DD-HHmmSS}}`,
+        ]
+      } as Inputs,
+      {
+        main: "2020-01-10T00-30-00Z",
+        partial: [],
+        latest: false
+      } as Version,
+      [
+        'org/app:2020-01-10T00-30-00Z'
+      ],
+      [
+        "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
+        "org.opencontainers.image.description=This your first repo!",
+        "org.opencontainers.image.licenses=MIT",
+        "org.opencontainers.image.revision=a9c8c5828b91be19d9728548b24759e352367ef1",
+        "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
+        "org.opencontainers.image.title=Hello-World",
+        "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
+        "org.opencontainers.image.version=2020-01-10T00-30-00Z"
+      ],
+      undefined
+    ],
   ])('given %p with %p event', tagsLabelsTest);
 });
 
@@ -2691,14 +2735,14 @@ describe('pr-head-sha', () => {
       } as Inputs,
       {
         main: 'pr-15',
-        partial: ['sha-3370e22'],
+        partial: ['sha-3370e228f220'],
         latest: false
       } as Version,
       [
         'org/app:pr-15',
-        'org/app:sha-3370e22',
+        'org/app:sha-3370e228f220',
         'ghcr.io/user/app:pr-15',
-        'ghcr.io/user/app:sha-3370e22'
+        'ghcr.io/user/app:sha-3370e228f220'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -2722,14 +2766,14 @@ describe('pr-head-sha', () => {
         ]
       } as Inputs,
       {
-        main: 'sha-3370e22',
+        main: 'sha-3370e228f220',
         partial: ['pr-15'],
         latest: false
       } as Version,
       [
-        'org/app:sha-3370e22',
+        'org/app:sha-3370e228f220',
         'org/app:pr-15',
-        'ghcr.io/user/app:sha-3370e22',
+        'ghcr.io/user/app:sha-3370e228f220',
         'ghcr.io/user/app:pr-15'
       ],
       [
@@ -2740,7 +2784,7 @@ describe('pr-head-sha', () => {
         "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
         "org.opencontainers.image.title=Hello-World",
         "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
-        "org.opencontainers.image.version=sha-3370e22"
+        "org.opencontainers.image.version=sha-3370e228f220"
       ]
     ],
     [
@@ -2820,14 +2864,14 @@ describe('pr-head-sha', () => {
         ]
       } as Inputs,
       {
-        main: 'sha-3370e22',
+        main: 'sha-3370e228f220',
         partial: ['pr-15'],
         latest: false
       } as Version,
       [
-        'org/app:sha-3370e22',
+        'org/app:sha-3370e228f220',
         'org/app:pr-15',
-        'ghcr.io/user/app:sha-3370e22',
+        'ghcr.io/user/app:sha-3370e228f220',
         'ghcr.io/user/app:pr-15'
       ],
       [
@@ -2838,7 +2882,7 @@ describe('pr-head-sha', () => {
         "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
         "org.opencontainers.image.title=Hello-World",
         "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
-        "org.opencontainers.image.version=sha-3370e22"
+        "org.opencontainers.image.version=sha-3370e228f220"
       ]
     ],
     [
@@ -2890,14 +2934,14 @@ describe('pr-head-sha', () => {
       {
         main: 'pr-15',
         partial: [
-          'sha-3370e22',
+          'sha-3370e228f220',
           'sha-3370e228f2209994d57af4427fe64e71bb79ac96'
         ],
         latest: false
       } as Version,
       [
         'org/app:pr-15',
-        'org/app:sha-3370e22',
+        'org/app:sha-3370e228f220',
         'org/app:sha-3370e228f2209994d57af4427fe64e71bb79ac96'
       ],
       [
@@ -2969,13 +3013,41 @@ describe('pr-head-sha', () => {
         "org.opencontainers.image.version=mytag-master"
       ]
     ],
+    [
+      'pr12',
+      'event_pull_request.env',
+      {
+        images: ['org/app'],
+        tags: [
+          `type=raw,value=src-{{commit_date YYYY-MM-DD}}`,
+        ]
+      } as Inputs,
+      {
+        main: "src-2020-01-10T00-30-00Z",
+        partial: [],
+        latest: false
+      } as Version,
+      [
+        "org/app:src-2020-01-10T00-30-00Z",
+      ],
+      [
+        "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
+        "org.opencontainers.image.description=This your first repo!",
+        "org.opencontainers.image.licenses=MIT",
+        "org.opencontainers.image.revision=3370e228f2209994d57af4427fe64e71bb79ac96",
+        "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
+        "org.opencontainers.image.title=Hello-World",
+        "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
+        "org.opencontainers.image.version=src-2020-01-10T00-30-00Z",
+      ]
+    ],
   ])('given %p with %p event', async (name: string, envFile: string, inputs: Inputs, exVersion: Version, exTags: Array<string>, exLabelsAnnotations: Array<string>) => {
     process.env = dotenv.parse(fs.readFileSync(path.join(__dirname, 'fixtures', envFile)));
     process.env.DOCKER_METADATA_PR_HEAD_SHA = 'true';
 
     const toolkit = new Toolkit();
     const repo = await toolkit.github.repoData();
-    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow), repo);
+    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow, toolkit), repo);
 
     const version = meta.version;
     expect(version).toEqual(exVersion);
@@ -3028,16 +3100,20 @@ describe('schedule', () => {
       {
         images: ['user/app'],
         tags: [
-          `type=schedule,pattern={{date 'YYYYMMDD'}}`
+          `type=schedule,pattern={{date 'YYYYMMDD'}}`,
+          `type=schedule,pattern=source-date-{{commit_date 'YYYY-MM-DD'}}`
         ]
       } as Inputs,
       {
         main: '20200110',
-        partial: [],
+        partial: [
+          "source-date-2020-01-10",
+        ],
         latest: false
       } as Version,
       [
-        'user/app:20200110'
+        'user/app:20200110',
+        'user/app:source-date-2020-01-10'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -3121,14 +3197,14 @@ describe('schedule', () => {
       } as Inputs,
       {
         main: 'nightly',
-        partial: ['sha-860c190'],
+        partial: ['sha-860c1904a1ce'],
         latest: false
       } as Version,
       [
         'org/app:nightly',
-        'org/app:sha-860c190',
+        'org/app:sha-860c1904a1ce',
         'ghcr.io/user/app:nightly',
-        'ghcr.io/user/app:sha-860c190'
+        'ghcr.io/user/app:sha-860c1904a1ce'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -3154,7 +3230,7 @@ describe('schedule', () => {
         ]
       } as Inputs,
       {
-        main: 'sha-860c190',
+        main: 'sha-860c1904a1ce',
         partial: [
           'nightly',
           'defbranch'
@@ -3162,10 +3238,10 @@ describe('schedule', () => {
         latest: false
       } as Version,
       [
-        'org/app:sha-860c190',
+        'org/app:sha-860c1904a1ce',
         'org/app:nightly',
         'org/app:defbranch',
-        'ghcr.io/user/app:sha-860c190',
+        'ghcr.io/user/app:sha-860c1904a1ce',
         'ghcr.io/user/app:nightly',
         'ghcr.io/user/app:defbranch'
       ],
@@ -3177,7 +3253,7 @@ describe('schedule', () => {
         "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
         "org.opencontainers.image.title=Hello-World",
         "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
-        "org.opencontainers.image.version=sha-860c190"
+        "org.opencontainers.image.version=sha-860c1904a1ce"
       ],
       undefined
     ],
@@ -3221,16 +3297,20 @@ describe('schedule', () => {
       {
         images: ['user/app'],
         tags: [
-          `type=schedule,pattern={{date 'YYYYMMDD-HHmmss' tz='Asia/Tokyo'}}`
+          `type=schedule,pattern={{date 'YYYYMMDD-HHmmss' tz='Asia/Tokyo'}}`,
+          `type=schedule,pattern=src-{{commit_date 'YYYYMMDD-HHmmss' tz='Asia/Tokyo'}}`,
         ]
       } as Inputs,
       {
         main: '20200110-093000',
-        partial: [],
+        partial: [
+          "src-20200110-093000",
+        ],
         latest: false
       } as Version,
       [
-        'user/app:20200110-093000'
+        'user/app:20200110-093000',
+        'user/app:src-20200110-093000'
       ],
       [
         "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
@@ -3312,6 +3392,39 @@ describe('release', () => {
         "org.opencontainers.image.version=v1.1.1"
       ],
       undefined
+    ],
+    [
+      'release03',
+      'event_release_created.env',
+      {
+        images: ['user/app'],
+        tags: [
+          `type=raw,value=src-{{commit_date 'YYYYMMDD-HHmmss'}}`,
+          `type=raw,value={{date 'YYYYMMDD-HHmmss'}}`,
+        ]
+      } as Inputs,
+      {
+      "main": "src-20200110-003000",
+        partial: [
+        "20200110-003000",
+        ],
+"latest": false,
+      } as Version,
+      [
+        "user/app:src-20200110-003000",
+        "user/app:20200110-003000",
+      ],
+      [
+        "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
+        "org.opencontainers.image.description=This your first repo!",
+        "org.opencontainers.image.licenses=MIT",
+        "org.opencontainers.image.revision=860c1904a1ce19322e91ac35af1ab07466440c37",
+        "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
+        "org.opencontainers.image.title=Hello-World",
+        "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
+      "org.opencontainers.image.version=src-20200110-003000",
+      ],
+      undefined
     ]
   ])('given %s with %p event', tagsLabelsTest);
 });
@@ -4012,7 +4125,7 @@ describe('json', () => {
 
     const toolkit = new Toolkit();
     const repo = await toolkit.github.repoData();
-    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow), repo);
+    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow,toolkit), repo);
 
     const jsonOutput = meta.getJSON(['manifest']);
     expect(jsonOutput).toEqual(exJSON);
@@ -4528,7 +4641,7 @@ describe('bakeFile', () => {
 
     const toolkit = new Toolkit();
     const repo = await toolkit.github.repoData();
-    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow), repo);
+    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow,toolkit), repo);
 
     const bakeFileTags = meta.getBakeFile('tags');
     expect(JSON.parse(fs.readFileSync(bakeFileTags, 'utf8'))).toEqual(exBakeTags);
@@ -4592,7 +4705,7 @@ describe('bakeFileTagsLabels', () => {
 
     const toolkit = new Toolkit();
     const repo = await toolkit.github.repoData();
-    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow), repo);
+    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow,toolkit), repo);
 
     const bakeFile = meta.getBakeFileTagsLabels();
     expect(JSON.parse(fs.readFileSync(bakeFile, 'utf8'))).toEqual(exBakeDefinition);
@@ -4638,8 +4751,10 @@ describe('sepTags', () => {
     process.env = dotenv.parse(fs.readFileSync(path.join(__dirname, 'fixtures', envFile)));
 
     const toolkit = new Toolkit();
+
     const repo = await toolkit.github.repoData();
-    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow), repo);
+
+    const meta = new Meta({...getInputs(), ...inputs}, await getContext(ContextSource.workflow, toolkit), repo);
 
     expect(meta.getTags().join(inputs.sepTags)).toEqual(expTags);
   });

dev.Dockerfile

@@ -5,9 +5,16 @@ ARG NODE_VERSION=20
 FROM node:${NODE_VERSION}-alpine AS base
 RUN apk add --no-cache cpio findutils git
 WORKDIR /src
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/.yarn/cache <<EOT
+  corepack enable
+  yarn --version
+  yarn config set --home enableTelemetry 0
+EOT
 
 FROM base AS deps
 RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn install && mkdir /vendor && cp yarn.lock /vendor
 
@@ -20,7 +27,7 @@ RUN --mount=type=bind,target=.,rw <<EOT
   git add -A
   cp -rf /vendor/* .
   if [ -n "$(git status --porcelain -- yarn.lock)" ]; then
-    echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor-update"'
+    echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor"'
     git status --porcelain -- yarn.lock
     exit 1
   fi
@@ -28,6 +35,7 @@ EOT
 
 FROM deps AS build
 RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn run build && mkdir /out && cp -Rf dist /out/
 
@@ -48,22 +56,23 @@ EOT
 
 FROM deps AS format
 RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn run format \
-  && mkdir /out && find . -name '*.ts' -not -path './node_modules/*' | cpio -pdm /out
+  && mkdir /out && find . -name '*.ts' -not -path './node_modules/*' -not -path './.yarn/*' | cpio -pdm /out
 
 FROM scratch AS format-update
 COPY --from=format /out /
 
 FROM deps AS lint
 RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn run lint
 
 FROM deps AS test
-ENV RUNNER_TEMP=/tmp/github_runner
-ENV RUNNER_TOOL_CACHE=/tmp/github_tool_cache
 RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/.yarn/cache \
   --mount=type=cache,target=/src/node_modules \
   yarn run test --coverage --coverageDirectory=/tmp/coverage
 

docker-bake.hcl

@@ -3,7 +3,7 @@ group "default" {
 }
 
 group "pre-checkin" {
-  targets = ["vendor-update", "format", "build"]
+  targets = ["vendor", "format", "build"]
 }
 
 group "validate" {
@@ -34,7 +34,7 @@ target "lint" {
   output = ["type=cacheonly"]
 }
 
-target "vendor-update" {
+target "vendor" {
   dockerfile = "dev.Dockerfile"
   target = "vendor-update"
   output = ["."]

package.json

@@ -1,17 +1,16 @@
 {
   "name": "docker-metadata-action",
   "description": "GitHub Action to extract metadata (tags, labels) for Docker",
-  "main": "lib/main.js",
+  "main": "src/main.ts",
   "scripts": {
-    "build": "ncc build src/main.ts --source-map --minify --license licenses.txt",
+    "build": "ncc build --source-map --minify --license licenses.txt",
     "lint": "yarn run prettier && yarn run eslint",
     "format": "yarn run prettier:fix && yarn run eslint:fix",
     "eslint": "eslint --max-warnings=0 .",
     "eslint:fix": "eslint --fix .",
     "prettier": "prettier --check \"./**/*.ts\"",
     "prettier:fix": "prettier --write \"./**/*.ts\"",
-    "test": "jest",
+    "test": "jest"
-    "all": "yarn run build && yarn run format && yarn test"
   },
   "repository": {
     "type": "git",
@@ -26,33 +25,34 @@
   ],
   "author": "Docker Inc.",
   "license": "Apache-2.0",
+  "packageManager": "yarn@3.6.3",
   "dependencies": {
-    "@actions/core": "^1.10.1",
+    "@actions/core": "^1.11.1",
     "@actions/github": "^6.0.0",
-    "@docker/actions-toolkit": "^0.14.0",
+    "@docker/actions-toolkit": "^0.44.0",
     "@renovate/pep440": "^1.0.0",
-    "csv-parse": "^5.5.2",
+    "csv-parse": "^5.5.6",
     "handlebars": "^4.7.8",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
-    "moment-timezone": "^0.5.43",
+    "moment-timezone": "^0.5.46",
-    "semver": "^7.5.4"
+    "semver": "^7.6.3"
   },
   "devDependencies": {
     "@types/csv-parse": "^1.2.2",
-    "@types/node": "^20.5.9",
+    "@types/node": "^20.12.12",
-    "@types/semver": "^7.5.1",
+    "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@typescript-eslint/eslint-plugin": "^7.9.0",
-    "@typescript-eslint/parser": "^6.6.0",
+    "@typescript-eslint/parser": "^7.9.0",
-    "@vercel/ncc": "^0.38.0",
+    "@vercel/ncc": "^0.38.1",
-    "dotenv": "^16.3.1",
+    "dotenv": "^16.4.5",
-    "eslint": "^8.48.0",
+    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-jest": "^27.2.3",
+    "eslint-plugin-jest": "^28.5.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.2.5",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.5"
   }
 }

src/context.ts

@@ -1,8 +1,13 @@
 import * as core from '@actions/core';
-import {Context} from '@actions/github/lib/context';
+import {Context as GithubContext} from '@actions/github/lib/context';
 import {Util} from '@docker/actions-toolkit/lib/util';
 import {Git} from '@docker/actions-toolkit/lib/git';
 import {GitHub} from '@docker/actions-toolkit/lib/github';
+import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
+
+export interface Context extends GithubContext {
+  commitDate: Date;
+}
 
 export interface Inputs {
   context: ContextSource;
@@ -39,10 +44,10 @@ export enum ContextSource {
   git = 'git'
 }
 
-export async function getContext(source: ContextSource): Promise<Context> {
+export async function getContext(source: ContextSource, toolkit: Toolkit): Promise<Context> {
   switch (source) {
     case ContextSource.workflow:
-      return getContextFromWorkflow();
+      return await getContextFromWorkflow(toolkit);
     case ContextSource.git:
       return await getContextFromGit();
     default:
@@ -50,7 +55,7 @@ export async function getContext(source: ContextSource): Promise<Context> {
   }
 }
 
-function getContextFromWorkflow(): Context {
+async function getContextFromWorkflow(toolkit: Toolkit): Promise<Context> {
   const context = GitHub.context;
 
   // Needs to override Git reference with pr ref instead of upstream branch ref
@@ -69,9 +74,56 @@ function getContextFromWorkflow(): Context {
     }
   }
 
-  return context;
+  return {
+    commitDate: await getCommitDateFromWorkflow(context.sha, toolkit),
+    ...context
+  } as Context;
 }
 
 async function getContextFromGit(): Promise<Context> {
-  return await Git.context();
+  const ctx = await Git.context();
+
+  return {
+    commitDate: await Git.commitDate(ctx.sha),
+    ...ctx
+  } as Context;
+}
+
+async function getCommitDateFromWorkflow(sha: string, toolkit: Toolkit): Promise<Date> {
+  const event = GitHub.context.payload as unknown as {
+    // branch push
+    commits?: Array<{
+      timestamp: string;
+      // commit sha
+      id: string;
+    }>;
+    // tags
+    head_commit?: {
+      timestamp: string;
+      // commit sha
+      id: string;
+    };
+  };
+
+  if (event.commits) {
+    const commitDate = event.commits.find(x => x.id === sha)?.timestamp;
+    if (commitDate) {
+      return new Date(commitDate);
+    }
+  }
+
+  if (event.head_commit) {
+    if (event.head_commit.id === sha) {
+      return new Date(event.head_commit.timestamp);
+    }
+  }
+
+  // fallback to github api for commit date
+  const commit = await toolkit.github.octokit.request('GET /repos/{owner}/{repo}/commits/{commit_sha}', {
+    commit_sha: sha,
+    owner: GitHub.context.repo.owner,
+    repo: GitHub.context.repo.repo
+  });
+
+  return new Date(commit.data.committer.date);
 }

src/main.ts

@@ -6,17 +6,12 @@ import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
 import {getContext, getInputs, Inputs} from './context';
 import {Meta, Version} from './meta';
 
-function setOutput(name: string, value: string) {
-  core.setOutput(name, value);
-  core.exportVariable(`DOCKER_METADATA_OUTPUT_${name.replace(/\W/g, '_').toUpperCase()}`, value);
-}
-
 actionsToolkit.run(
   // main
   async () => {
     const inputs: Inputs = getInputs();
     const toolkit = new Toolkit({githubToken: inputs.githubToken});
-    const context = await getContext(inputs.context);
+    const context = await getContext(inputs.context, toolkit);
     const repo = await toolkit.github.repoData();
 
     await core.group(`Context info`, async () => {
@@ -28,6 +23,7 @@ actionsToolkit.run(
       core.info(`actor: ${context.actor}`);
       core.info(`runNumber: ${context.runNumber}`);
       core.info(`runId: ${context.runId}`);
+      core.info(`commitDate: ${context.commitDate}`);
     });
 
     if (core.isDebug()) {
@@ -105,6 +101,11 @@ actionsToolkit.run(
     }
 
     // Bake file with tags and labels
-    setOutput(`bake-file`, meta.getBakeFileTagsLabels());
+    setOutput(`bake-file`, `${meta.getBakeFileTagsLabels()}`);
   }
 );
+
+function setOutput(name: string, value: string) {
+  core.setOutput(name, value);
+  core.exportVariable(`DOCKER_METADATA_OUTPUT_${name.replace(/\W/g, '_').toUpperCase()}`, value);
+}

src/meta.ts

@@ -5,15 +5,16 @@ import moment from 'moment-timezone';
 import * as pep440 from '@renovate/pep440';
 import * as semver from 'semver';
 import * as core from '@actions/core';
-import {Context} from '@actions/github/lib/context';
 import {Context as ToolkitContext} from '@docker/actions-toolkit/lib/context';
 import {GitHubRepo} from '@docker/actions-toolkit/lib/types/github';
 
-import {Inputs} from './context';
+import {Inputs, Context} from './context';
 import * as icl from './image';
 import * as tcl from './tag';
 import * as fcl from './flavor';
 
+const defaultShortShaLength = 12;
+
 export interface Version {
   main: string | undefined;
   partial: string[];
@@ -113,6 +114,7 @@ export class Meta {
     }
 
     const currentDate = this.date;
+    const commitDate = this.context.commitDate;
     const vraw = this.setValue(
       handlebars.compile(tag.attrs['pattern'])({
         date: function (format, options) {
@@ -128,6 +130,20 @@ export class Meta {
             }
           });
           return m.tz(tz).format(format);
+        },
+        commit_date: function (format, options) {
+          const m = moment(commitDate);
+          let tz = 'UTC';
+          Object.keys(options.hash).forEach(key => {
+            switch (key) {
+              case 'tz':
+                tz = options.hash[key];
+                break;
+              default:
+                throw new Error(`Unknown ${key} attribute`);
+            }
+          });
+          return m.tz(tz).format(format);
         }
       }),
       tag
@@ -307,7 +323,7 @@ export class Meta {
 
     let val = this.context.sha;
     if (tag.attrs['format'] === tcl.ShaFormat.Short) {
-      val = this.context.sha.substring(0, 7);
+      val = Meta.shortSha(this.context.sha);
     }
 
     const vraw = this.setValue(val, tag);
@@ -359,6 +375,7 @@ export class Meta {
   private setGlobalExp(val): string {
     const context = this.context;
     const currentDate = this.date;
+    const commitDate = this.context.commitDate;
     return handlebars.compile(val)({
       branch: function () {
         if (!/^refs\/heads\//.test(context.ref)) {
@@ -373,7 +390,7 @@ export class Meta {
         return context.ref.replace(/^refs\/tags\//g, '');
       },
       sha: function () {
-        return context.sha.substring(0, 7);
+        return Meta.shortSha(context.sha);
       },
       base_ref: function () {
         if (/^refs\/tags\//.test(context.ref) && context.payload?.base_ref != undefined) {
@@ -386,6 +403,20 @@ export class Meta {
         }
         return '';
       },
+      commit_date: function (format, options) {
+        const m = moment(commitDate);
+        let tz = 'UTC';
+        Object.keys(options.hash).forEach(key => {
+          switch (key) {
+            case 'tz':
+              tz = options.hash[key];
+              break;
+            default:
+              throw new Error(`Unknown ${key} attribute`);
+          }
+        });
+        return m.tz(tz).format(format);
+      },
       is_default_branch: function () {
         const branch = context.ref.replace(/^refs\/heads\//g, '');
         // TODO: "base_ref" is available in the push payload but doesn't always seem to
@@ -522,70 +553,66 @@ export class Meta {
 
   public getBakeFile(kind: string): string {
     if (kind == 'tags') {
-      return this.generateBakeFile(kind, {
+      return this.generateBakeFile(
-        tags: this.getTags(),
+        {
-        args: {
+          tags: this.getTags(),
-          DOCKER_META_IMAGES: this.getImageNames().join(','),
+          args: {
-          DOCKER_META_VERSION: this.version.main
+            DOCKER_META_IMAGES: this.getImageNames().join(','),
-        }
+            DOCKER_META_VERSION: this.version.main
-      });
-    } else if (kind == 'labels') {
-      return this.generateBakeFile(kind, {
-        labels: this.getLabels().reduce((res, label) => {
-          const matches = label.match(/([^=]*)=(.*)/);
-          if (!matches) {
-            return res;
           }
-          res[matches[1]] = matches[2];
+        },
-          return res;
+        kind
-        }, {})
+      );
-      });
+    } else if (kind == 'labels') {
+      return this.generateBakeFile(
+        {
+          labels: this.getLabels().reduce((res, label) => {
+            const matches = label.match(/([^=]*)=(.*)/);
+            if (!matches) {
+              return res;
+            }
+            res[matches[1]] = matches[2];
+            return res;
+          }, {})
+        },
+        kind
+      );
     } else if (kind.startsWith('annotations:')) {
       const name = kind.split(':')[0];
       const annotations: Array<string> = [];
       for (const level of kind.split(':')[1].split(',')) {
         annotations.push(...this.getAnnotations().map(label => `${level}:${label}`));
       }
-      return this.generateBakeFile(name, {
+      return this.generateBakeFile(
-        annotations: annotations
+        {
-      });
+          annotations: annotations
+        },
+        name
+      );
     }
     throw new Error(`Unknown bake file type: ${kind}`);
   }
 
   public getBakeFileTagsLabels(): string {
-    const bakeFile = path.join(ToolkitContext.tmpDir(), 'docker-metadata-action-bake.json');
+    return this.generateBakeFile({
-    fs.writeFileSync(
+      tags: this.getTags(),
-      bakeFile,
+      labels: this.getLabels().reduce((res, label) => {
-      JSON.stringify(
+        const matches = label.match(/([^=]*)=(.*)/);
-        {
+        if (!matches) {
-          target: {
+          return res;
-            [this.inputs.bakeTarget]: {
+        }
-              tags: this.getTags(),
+        res[matches[1]] = matches[2];
-              labels: this.getLabels().reduce((res, label) => {
+        return res;
-                const matches = label.match(/([^=]*)=(.*)/);
+      }, {}),
-                if (!matches) {
+      args: {
-                  return res;
+        DOCKER_META_IMAGES: this.getImageNames().join(','),
-                }
+        DOCKER_META_VERSION: this.version.main
-                res[matches[1]] = matches[2];
+      }
-                return res;
+    });
-              }, {}),
-              args: {
-                DOCKER_META_IMAGES: this.getImageNames().join(','),
-                DOCKER_META_VERSION: this.version.main
-              }
-            }
-          }
-        },
-        null,
-        2
-      )
-    );
-    return bakeFile;
   }
 
-  private generateBakeFile(name: string, dt): string {
+  private generateBakeFile(dt, suffix?: string): string {
-    const bakeFile = path.join(ToolkitContext.tmpDir(), `docker-metadata-action-bake-${name}.json`);
+    const bakeFile = path.join(ToolkitContext.tmpDir(), `docker-metadata-action-bake${suffix ? `-${suffix}` : ''}.json`);
     fs.writeFileSync(bakeFile, JSON.stringify({target: {[this.inputs.bakeTarget]: dt}}, null, 2));
     return bakeFile;
   }
@@ -597,4 +624,18 @@ export class Meta {
   private static sanitizeTag(tag: string): string {
     return tag.replace(/[^a-zA-Z0-9._-]+/g, '-');
   }
+
+  private static shortSha(sha: string): string {
+    let shortShaLength = defaultShortShaLength;
+    if (process.env.DOCKER_METADATA_SHORT_SHA_LENGTH) {
+      if (isNaN(Number(process.env.DOCKER_METADATA_SHORT_SHA_LENGTH))) {
+        throw new Error(`DOCKER_METADATA_SHORT_SHA_LENGTH is not a valid number: ${process.env.DOCKER_METADATA_SHORT_SHA_LENGTH}`);
+      }
+      shortShaLength = Number(process.env.DOCKER_METADATA_SHORT_SHA_LENGTH);
+    }
+    if (shortShaLength >= sha.length) {
+      return sha;
+    }
+    return sha.substring(0, shortShaLength);
+  }
 }