Merge ~barryprice/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master

[Barry Price]

Add maintainer/build date labels, make tags more sensible

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Barry Price (barryprice)]

Successful Jenkins run of my branch:

https://jenkins.canonical.com/is/job/wordpress-k8s-image-builder/19/console

[Tom Haddon (mthaddon)]

Approved with one comment about adding a comment

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 625248ee904c67b6fcaa2640476d54d7088c5bc9

diff --git a/Dockerfile b/Dockerfile
index a6bed91..d9d9d67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,12 @@
 FROM ubuntu:bionic
 
-ARG http_proxy
-ARG https_proxy
+LABEL maintainer="[e-mail]"
+
+# HTTPS_PROXY used when we RUN curl to download Wordpress itself
+ARG HTTPS_PROXY
+ARG BUILD_DATE
+
+LABEL org.label-schema.build-date=$BUILD_DATE
 
 # Avoid interactive prompts
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
diff --git a/Makefile b/Makefile
index d3446e7..df973a9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,15 @@ build: lint deps
 	@echo "Fetching plugins and themes."
 	@tox -e fetch
 	@echo "Building the image."
-	@docker build . -t wordpress:latest --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg HTTPS_PROXY=$(HTTPS_PROXY)
+	@docker build \
+		--no-cache=true \
+		--build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+		--build-arg HTTPS_PROXY=$(HTTPS_PROXY) \
+		-t wordpress:bionic-latest \
+		.
 	@echo "Pushing to the prod-is-external registry."
-	@docker tag wordpress:latest prod-is-external.docker-registry.canonical.com/wordpress:latest
-	@docker push prod-is-external.docker-registry.canonical.com/wordpress:latest
+	@docker tag wordpress:bionic-latest prod-is-external.docker-registry.canonical.com/wordpress:bionic-latest
+	@docker push prod-is-external.docker-registry.canonical.com/wordpress:bionic-latest
 
 deps:
 	@echo "Checking dependencies are present"