From cf603f0736dbb34863c3e9eb5428f20d62f4f685 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Sun, 20 Oct 2019 05:18:58 +0200
Subject: [PATCH] Fix Docker labels

---
 .github/workflows/build.yml | 12 ++++++------
 Dockerfile                  |  7 +++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ae95d5..069c114 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,9 +41,9 @@ jobs:
         run: |
           docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \
             --output "type=image,push=false" \
-            --label "org.label-schema.build-date=${{ steps.prepare.outputs.build_date }}" \
-            --label "org.label-schema.version=${{ steps.prepare.outputs.version }}" \
-            --label "org.label-schema.vcs-ref=${GITHUB_SHA::8}" \
+            --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \
+            --build-arg "VCS_REF=${GITHUB_SHA::8}" \
+            --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \
             --tag "${{ steps.prepare.outputs.docker_image }}:latest" \
             --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \
             --file Dockerfile .
@@ -60,9 +60,9 @@ jobs:
         run: |
           docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \
             --output "type=image,push=true" \
-            --label "org.label-schema.build-date=${{ steps.prepare.outputs.build_date }}" \
-            --label "org.label-schema.version=${{ steps.prepare.outputs.version }}" \
-            --label "org.label-schema.vcs-ref=${GITHUB_SHA::8}" \
+            --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \
+            --build-arg "VCS_REF=${GITHUB_SHA::8}" \
+            --build-arg "VERSION=${{ steps.prepare.outputs.version }}" \
             --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \
             --tag "${{ steps.prepare.outputs.docker_image }}:latest" \
             --file Dockerfile .
diff --git a/Dockerfile b/Dockerfile
index 36dab71..1e0d6c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,21 @@
 # syntax=docker/dockerfile:experimental
 FROM --platform=${TARGETPLATFORM:-linux/amd64} adoptopenjdk:12-jre-hotspot
 
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN printf "I am running on ${BUILDPLATFORM:-linux/amd64}, building for ${TARGETPLATFORM:-linux/amd64}\n$(uname -a)\n"
 
 LABEL maintainer="CrazyMax" \
+  org.label-schema.build-date=$BUILD_DATE \
   org.label-schema.name="jetbrains-license-server" \
   org.label-schema.description="JetBrains License Server" \
+  org.label-schema.version=$VERSION \
   org.label-schema.url="https://github.com/crazy-max/docker-jetbrains-license-server" \
+  org.label-schema.vcs-ref=$VCS_REF \
   org.label-schema.vcs-url="https://github.com/crazy-max/docker-jetbrains-license-server" \
   org.label-schema.vendor="CrazyMax" \
   org.label-schema.schema-version="1.0"