wordpress-charmers team mailing list archive

[Thomas Cuthbert <thomas.cuthbert@xxxxxxxxxxxxx>]

Thomas Cuthbert has proposed merging ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master.

Requested reviews:
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder/+merge/385885
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master.

diff --git a/Makefile b/Makefile
index ab094bf..4a7a40c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 DIST_RELEASE ?= bionic
+VERSION ?= latest
 DOCKER_DEPS = \
 	apache2 \
 	curl \
@@ -24,13 +25,13 @@ build-image:
 		--build-arg PKGS_TO_INSTALL='$(DOCKER_DEPS)' \
 		--build-arg DIST_RELEASE=$(DIST_RELEASE) \
 		--build-arg HTTPS_PROXY=$(HTTPS_PROXY) \
-		-t wordpress:$(DIST_RELEASE)-latest \
+		-t wordpress:$(DIST_RELEASE)-$(VERSION) \
 		.
 
 build: lint deps fetch build-image
 	@echo "Pushing to the prod-is-external registry."
-	@docker tag wordpress:$(DIST_RELEASE)-latest prod-is-external.docker-registry.canonical.com/wordpress:$(DIST_RELEASE)-latest
-	@docker push prod-is-external.docker-registry.canonical.com/wordpress:$(DIST_RELEASE)-latest
+	@docker tag wordpress:$(DIST_RELEASE)-$(VERSION) prod-is-external.docker-registry.canonical.com/wordpress:$(DIST_RELEASE)-$(VERSION)
+	@docker push prod-is-external.docker-registry.canonical.com/wordpress:$(DIST_RELEASE)-$(VERSION)
 
 deps:
 	@echo "Checking dependencies are present"