wordpress-charmers team mailing list archive

[Tom Haddon <tom.haddon@xxxxxxxxxxxxx>]

Tom Haddon has proposed merging ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:image-version into charm-k8s-wordpress:master.

Commit message:
Download a specific version rather than just 'latest' - this will make it more obvious when to upgrade. Will also update OCI Recipe to if/once this is approved.

Requested reviews:
  Canonical IS Reviewers (canonical-is-reviewers)
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/395494

Download a specific version rather than just 'latest' - this will make it more obvious when to upgrade. Will also update OCI Recipe to if/once this is approved.
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:image-version into charm-k8s-wordpress:master.

diff --git a/Dockerfile b/Dockerfile
index 1fe4cbd..7603e5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,10 @@ LABEL org.label-schema.version=${DIST_RELEASE}-${VERSION}
 # HTTPS_PROXY used when we RUN curl to download Wordpress itself
 ARG BUILD_DATE
 ARG HTTPS_PROXY
+ARG VERSION
+
+# Used by Launchpad OCI Recipe to tag version
+LABEL org.label-schema.version=${VERSION:-5.6}
 
 # Launchpad OCI image builds don't support dynamic arg parsing. Skip until
 # https://bugs.launchpad.net/launchpad/+bug/1902010 is resolved.
@@ -60,7 +64,7 @@ RUN a2enconf docker-php \
     && a2enmod rewrite
 
 # Install the main Wordpress code, this will be our only site so /var/www/html is fine
-RUN curl -o wordpress.tar.gz -fSL "https://wordpress.org/latest.tar.gz"; \
+RUN curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${VERSION}.tar.gz"; \
     && tar -xzf wordpress.tar.gz -C /usr/src/ \
     && rm wordpress.tar.gz \
     && chown -R www-data:www-data /usr/src/wordpress \
diff --git a/image-builder/Makefile b/image-builder/Makefile
index 1db3c38..3b09be8 100644
--- a/image-builder/Makefile
+++ b/image-builder/Makefile
@@ -1,11 +1,12 @@
 DIST_RELEASE ?= bionic
-VERSION ?= latest
+VERSION ?= 5.6
 
 build-image:
 	@echo "Building the image."
 	@docker build \
 		--no-cache=true \
 		--build-arg DIST_RELEASE=$(DIST_RELEASE) \
+		--build-arg VERSION=$(VERSION) \
 		-t wordpress:$(DIST_RELEASE)-$(VERSION) \
 		.
 lint: clean