From 7570e84faaef981139ec775c13fb6b9e21913b65 Mon Sep 17 00:00:00 2001
From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com>
Date: Wed, 2 Sep 2020 10:18:13 -0500
Subject: [PATCH] Adding more vars

---
 .automation/upload-docker.sh | 19 +++++++++++++++----
 Dockerfile                   |  9 ++++++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh
index c390fda4bc1..db1fde0b5c7 100755
--- a/.automation/upload-docker.sh
+++ b/.automation/upload-docker.sh
@@ -35,6 +35,12 @@ GCR_IMAGE_REPO=''                         # Docker tag for the image when create
 FOUND_IMAGE=0                             # Flag for if the image has already been built
 CONTAINER_URL=''                          # Final URL to upload
 
+###########################################################
+# Dynamic build variables to pass to container when built #
+###########################################################
+BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') # Current build date EX> "2017-08-28T09:24:41Z"
+BUILD_VERSION=''                            # Current version of the container being built
+
 #########################
 # Source Function Files #
 #########################
@@ -190,9 +196,14 @@ ValidateInput() {
     # Set the IMAGE_VERSION to the BRANCH_NAME #
     ############################################
     IMAGE_VERSION="${BRANCH_NAME}"
+    BUILD_VERSION="${IMAGE_VERSION}"
     info "Tag:[${IMAGE_VERSION}]"
   else
     info "Successfully found:${F[W]}[IMAGE_VERSION]${F[B]}, value:${F[W]}[${IMAGE_VERSION}]"
+    #########################
+    # Set the build version #
+    #########################
+    BUILD_VERSION="${IMAGE_VERSION}"
   fi
 
   ##################################
@@ -292,7 +303,7 @@ BuildImage() {
   ###################
   # Build the image #
   ###################
-  docker build --no-cache -t "${CONTAINER_URL}:${IMAGE_VERSION}" -f "${DOCKERFILE_PATH}" . 2>&1
+  docker build --no-cache --build-arg "BUILD_DATE=${BUILD_DATE}" --build-arg "BUILD_VERSION=${BUILD_VERSION}" -t "${CONTAINER_URL}:${IMAGE_VERSION}" -f "${DOCKERFILE_PATH}" . 2>&1
 
   #######################
   # Load the error code #
@@ -315,7 +326,7 @@ BuildImage() {
   ########################################################
   if [ ${UPDATE_MAJOR_TAG} -eq 1 ]; then
     # Tag the image with the major tag as well
-    docker build -t "${CONTAINER_URL}:${MAJOR_TAG}" -f "${DOCKERFILE_PATH}" . 2>&1
+    docker build  --build-arg "BUILD_DATE=${BUILD_DATE}" --build-arg "BUILD_VERSION=${MAJOR_TAG}" -t "${CONTAINER_URL}:${MAJOR_TAG}" -f "${DOCKERFILE_PATH}" . 2>&1
 
     #######################
     # Load the error code #
@@ -351,7 +362,7 @@ BuildImage() {
   ###################
   # Build the image #
   ###################
-  docker build -t "${ADDITONAL_URL}:${IMAGE_VERSION}" -f "${DOCKERFILE_PATH}" . 2>&1
+  docker build --build-arg "BUILD_DATE=${BUILD_DATE}" --build-arg "BUILD_VERSION=${BUILD_VERSION}" -t "${ADDITONAL_URL}:${IMAGE_VERSION}" -f "${DOCKERFILE_PATH}" . 2>&1
 
   #######################
   # Load the error code #
@@ -376,7 +387,7 @@ BuildImage() {
     ###################
     # Build the image #
     ###################
-    docker build -t "${ADDITONAL_URL}:${MAJOR_TAG}" -f "${DOCKERFILE_PATH}" . 2>&1
+    docker build --build-arg "BUILD_DATE=${BUILD_DATE}" --build-arg "BUILD_VERSION=${MAJOR_TAG}" -t "${ADDITONAL_URL}:${MAJOR_TAG}" -f "${DOCKERFILE_PATH}" . 2>&1
 
     #######################
     # Load the error code #
diff --git a/Dockerfile b/Dockerfile
index 9329cdce3c5..b16d60c5a14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,12 @@ FROM assignuser/chktex-alpine:v0.1.0 as chktex
 ##################
 FROM python:alpine
 
+############################
+# Get the build arguements #
+############################
+ARG BUILD_DATE
+ARG BUILD_VERSION
+
 #########################################
 # Label the instance and set maintainer #
 #########################################
@@ -32,13 +38,14 @@ LABEL com.github.actions.name="GitHub Super-Linter" \
       com.github.actions.icon="code" \
       com.github.actions.color="red" \
       maintainer="GitHub DevOps <github_devops@github.com>" \
+      org.opencontainers.image.created=$BUILD_DATE \
+      org.opencontainers.image.version=$BUILD_VERSION \
       org.opencontainers.image.authors="GitHub DevOps <github_devops@github.com>" \
       org.opencontainers.image.url="https://github.com/github/super-linter" \
       org.opencontainers.image.documentation="https://github.com/github/super-linter" \
       org.opencontainers.image.vendor="GitHub" \
       org.opencontainers.image.description="Lint your code base with GitHub Actions"
 
-
 ################################
 # Set ARG values used in Build #
 ################################