From db66d4df79e32f31859acb2abc7479dcb17d4e85 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Thu, 24 Dec 2020 16:45:28 +0100
Subject: [PATCH] Inject DOCKER_META_IMAGES and DOCKER_META_VERSION args in
 bake definition (#37)

Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 README.md              |  8 ++++++--
 __tests__/meta.test.ts | 28 ++++++++++++++++++++++++++++
 dist/index.js          |  6 +++++-
 src/meta.ts            |  6 +++++-
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ce259b9..4c226c5 100644
--- a/README.md
+++ b/README.md
@@ -159,8 +159,8 @@ jobs:
 ### Bake definition
 
 This action also handles a bake definition file that can be used with the
-[Docker Buildx Bake action](https://github.com/crazy-max/ghaction-docker-buildx-bake). You just have to declare a
-target named `ghaction-docker-meta`.
+[Docker Buildx Bake action](https://github.com/crazy-max/ghaction-docker-buildx-bake). You just have to declare an empty
+target named `ghaction-docker-meta` and inherit from it.
 
 ```hcl
 // docker-bake.hcl
@@ -240,6 +240,10 @@ Content of `${{ steps.docker_meta.outputs.bake-file }}` file will look like this
         "org.opencontainers.image.created": "2020-01-10T00:30:00.000Z",
         "org.opencontainers.image.revision": "90dd6032fac8bda1b6c4436a2e65de27961ed071",
         "org.opencontainers.image.licenses": "MIT"
+      },
+      "args": {
+        "DOCKER_META_IMAGES": "name/app",
+        "DOCKER_META_VERSION": "1.1.1"
       }
     }
   }
diff --git a/__tests__/meta.test.ts b/__tests__/meta.test.ts
index 844a3f7..3dab864 100644
--- a/__tests__/meta.test.ts
+++ b/__tests__/meta.test.ts
@@ -1512,6 +1512,10 @@ describe('bake-file', () => {
               "org.opencontainers.image.created": "2020-01-10T00:30:00.000Z",
               "org.opencontainers.image.revision": "90dd6032fac8bda1b6c4436a2e65de27961ed071",
               "org.opencontainers.image.licenses": "MIT"
+            },
+            "args": {
+              "DOCKER_META_IMAGES": "user/app",
+              "DOCKER_META_VERSION": "dev",
             }
           }
         }
@@ -1539,6 +1543,10 @@ describe('bake-file', () => {
               "org.opencontainers.image.created": "2020-01-10T00:30:00.000Z",
               "org.opencontainers.image.revision": "90dd6032fac8bda1b6c4436a2e65de27961ed071",
               "org.opencontainers.image.licenses": "MIT"
+            },
+            "args": {
+              "DOCKER_META_IMAGES": "user/app",
+              "DOCKER_META_VERSION": "dev",
             }
           }
         }
@@ -1569,6 +1577,10 @@ describe('bake-file', () => {
               "org.opencontainers.image.created": "2020-01-10T00:30:00.000Z",
               "org.opencontainers.image.revision": "90dd6032fac8bda1b6c4436a2e65de27961ed071",
               "org.opencontainers.image.licenses": "MIT"
+            },
+            "args": {
+              "DOCKER_META_IMAGES": "user/app",
+              "DOCKER_META_VERSION": "release1",
             }
           }
         }
@@ -1600,6 +1612,10 @@ describe('bake-file', () => {
               "org.opencontainers.image.created": "2020-01-10T00:30:00.000Z",
               "org.opencontainers.image.revision": "90dd6032fac8bda1b6c4436a2e65de27961ed071",
               "org.opencontainers.image.licenses": "MIT"
+            },
+            "args": {
+              "DOCKER_META_IMAGES": "user/app",
+              "DOCKER_META_VERSION": "20200110",
             }
           }
         }
@@ -1640,6 +1656,10 @@ describe('bake-file', () => {
               "org.opencontainers.image.created": "2020-01-10T00:30:00.000Z",
               "org.opencontainers.image.revision": "90dd6032fac8bda1b6c4436a2e65de27961ed071",
               "org.opencontainers.image.licenses": "MIT"
+            },
+            "args": {
+              "DOCKER_META_IMAGES": "org/app,ghcr.io/user/app",
+              "DOCKER_META_VERSION": "1.1.1",
             }
           }
         }
@@ -1673,6 +1693,10 @@ describe('bake-file', () => {
               "org.opencontainers.image.created": "2020-01-10T00:30:00.000Z",
               "org.opencontainers.image.revision": "90dd6032fac8bda1b6c4436a2e65de27961ed071",
               "org.opencontainers.image.licenses": "MIT"
+            },
+            "args": {
+              "DOCKER_META_IMAGES": "org/app,ghcr.io/user/app",
+              "DOCKER_META_VERSION": "my",
             }
           }
         }
@@ -1707,6 +1731,10 @@ describe('bake-file', () => {
               "org.opencontainers.image.created": "2020-01-10T00:30:00.000Z",
               "org.opencontainers.image.revision": "90dd6032fac8bda1b6c4436a2e65de27961ed071",
               "org.opencontainers.image.licenses": "MIT"
+            },
+            "args": {
+              "DOCKER_META_IMAGES": "org/app",
+              "DOCKER_META_VERSION": "v1.1.1",
             }
           }
         }
diff --git a/dist/index.js b/dist/index.js
index 02424e5..678aae9 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -434,7 +434,11 @@ class Meta {
             target: {
                 'ghaction-docker-meta': {
                     tags: this.tags(),
-                    labels: jsonLabels
+                    labels: jsonLabels,
+                    args: {
+                        DOCKER_META_IMAGES: this.inputs.images.join(','),
+                        DOCKER_META_VERSION: this.version.main
+                    }
                 }
             }
         }, null, 2));
diff --git a/src/meta.ts b/src/meta.ts
index c019c03..592071d 100644
--- a/src/meta.ts
+++ b/src/meta.ts
@@ -164,7 +164,11 @@ export class Meta {
           target: {
             'ghaction-docker-meta': {
               tags: this.tags(),
-              labels: jsonLabels
+              labels: jsonLabels,
+              args: {
+                DOCKER_META_IMAGES: this.inputs.images.join(','),
+                DOCKER_META_VERSION: this.version.main
+              }
             }
           }
         },