Merge pull request #24 from rtucek/add-more-badges

Build image with more meta data

Author: rtucek

Dockerfile

@@ -1,9 +1,22 @@
 FROM debian:jessie
 
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+
+LABEL \
+    org.label-schema.build-date=${BUILD_DATE} \
+    org.label-schema.name="nginx-php Dockerfile" \
+    org.label-schema.schema-version="1.0" \
+    org.label-schema.vcs-ref=${VCS_REF} \
+    org.label-schema.vcs-url="https://github.com/rtucek/nginx-php" \
+    org.label-schema.version=${VERSION}
+
 ENV \
     NGINX_VERSION=1.11.9 \
     PHP_VERSION=7.1.1 \
-    XDEBUG_VERSION=2.5.0
+    XDEBUG_VERSION=2.5.0 \
+    VERSION=${VERSION}
 
 COPY \
     docker-entrypoint \

Makefile

@@ -3,14 +3,24 @@ IMAGE = nginx-php
 VERSION = 0.3.4
 EXTRAVERSION =
 
-IMAGE_FQN = $(REPO)/$(IMAGE):v$(VERSION)$(EXTRAVERSION)
+IMAGE_NAME = $(REPO)/$(IMAGE)
+IMAGE_VERSION = v$(VERSION)$(EXTRAVERSION)
+IMAGE_FQN = $(IMAGE_NAME):$(IMAGE_VERSION)
 
 .PHONY: build
 
 default:	build
 
 build:
-	docker build -t $(IMAGE_FQN) .
+	@docker build \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		--build-arg VERSION=$(IMAGE_VERSION) \
+		-t $(IMAGE_FQN) .
 
 test-build:
-	docker build -t testbuild .
+	@docker build \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		--build-arg VERSION=$(IMAGE_VERSION) \
+		-t $(IMAGE_NAME):testbuild .