From 2a0b999568914b403beda96abc84f47632981633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20=C3=81lvaro?= <carlos.alvaro@citelan.es>
Date: Sat, 29 Dec 2018 10:58:40 +0100
Subject: [PATCH] Add Docker Labels from label-schema.org

---
 Dockerfile  | 20 ++++++++++++++++----
 hooks/build |  9 +++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 hooks/build

diff --git a/Dockerfile b/Dockerfile
index 658d4af..6960ec9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,7 @@
 FROM ubuntu:xenial-20181113
 
-LABEL maintainer="carlos.alvaro@citelan.es"
-LABEL description="SaltStack master"
-LABEL version="2018.3.3"
+ARG BUILD_DATE
+ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
 ENV SALT_VERSION="2018.3.3" \
@@ -75,7 +74,20 @@ RUN rm -rf ${SALT_BUILD_DIR}/*
 # Entrypoint
 COPY entrypoint.sh /sbin/entrypoint.sh
 RUN chmod +x /sbin/entrypoint.sh
-WORKDIR ${SALT_HOME}
 
+LABEL \
+    maintainer="github@cdalvaro.io" \
+    org.label-schema.vendor=cdalvaro \
+    org.label-schema.name="SaltStack Master" \
+    org.label-schema.version=${SALT_VERSION} \
+    org.label-schema.description="Dockerized SaltStack Master" \
+    org.label-schema.url="https://github.com/cdalvaro/saltstack-master" \
+    org.label-schema.vcs-url="https://github.com/cdalvaro/saltstack-master.git" \
+    org.label-schema.vcs-ref=${VCS_REF} \
+    org.label-schema.build-date=${BUILD_DATE} \
+    org.label-schema.docker.schema-version="1.0" \
+    com.cdalvaro.saltstack-master.license=MIT
+
+WORKDIR ${SALT_HOME}
 ENTRYPOINT [ "/sbin/entrypoint.sh" ]
 CMD [ "app:start" ]
diff --git a/hooks/build b/hooks/build
new file mode 100644
index 0000000..9f8033b
--- /dev/null
+++ b/hooks/build
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Docker Daemon Build Hook
+# $IMAGE_NAME var is injected into the build so the tag is correct.
+
+docker build \
+		--build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
+		--build-arg=VCS_REF="$(git rev-parse --short HEAD)" \
+		-t ${IMAGE_NAME} .
\ No newline at end of file