From 4c0cb53110cc4a09934edbe171a61f9d4e717c75 Mon Sep 17 00:00:00 2001
From: Russell Trow <russell@dockleafdigital.com>
Date: Mon, 20 Jun 2016 12:29:09 +0100
Subject: [PATCH] Added Dockerfile Labels from label-schema.org

---
 0.6/consul/Dockerfile | 11 +++++++++++
 0.6/consul/Makefile   |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/0.6/consul/Dockerfile b/0.6/consul/Dockerfile
index 6468eac..745d3ef 100644
--- a/0.6/consul/Dockerfile
+++ b/0.6/consul/Dockerfile
@@ -4,6 +4,17 @@ ENV CONSUL_VERSION 0.6.4
 ENV CONSUL_SHA256 abdf0e1856292468e2c9971420d73b805e93888e006c76324ae39416edcf0627
 ENV GLIBC_VERSION "2.23-r1"
 
+# Basic build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG VCS_REF
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.license="BSD" \
+      org.label-schema.name="Consul Agent in Docker" \
+      org.label-schema.url="https://hub.docker.com/r/progrium/consul/" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/gliderlabs/docker-consul.git" \
+      org.label-schema.vcs-type="Git"
+
 RUN apk --update add curl ca-certificates && \
     curl -Ls https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk > /tmp/glibc-${GLIBC_VERSION}.apk && \
     apk add --allow-untrusted /tmp/glibc-${GLIBC_VERSION}.apk && \
diff --git a/0.6/consul/Makefile b/0.6/consul/Makefile
index 33d1bdd..015f383 100644
--- a/0.6/consul/Makefile
+++ b/0.6/consul/Makefile
@@ -1,3 +1,5 @@
 
 build:
-	docker build -t gliderlabs/consul:$(VERSION) .
+	docker build -t gliderlabs/consul:$(VERSION) \
+							 --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+							 --build-arg VCS_REF=`git rev-parse --short HEAD` .
\ No newline at end of file