wordpress-charmers team mailing list archive

[James Simpson <mp+420141@xxxxxxxxxxxxxxxxxx>]

James Simpson has proposed merging ~jsimpso/charm-k8s-wordpress:master into charm-k8s-wordpress:master.

Commit message:
Bump wordpress version to 5.9.3

Requested reviews:
  🤖 prod-jenkaas-is (prod-jenkaas-is): continuous-integration
  Canonical IS Reviewers (canonical-is-reviewers)
  Wordpress Charmers (wordpress-charmers)

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

diff --git a/Dockerfile b/Dockerfile
index a338c56..a394f4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -106,7 +106,7 @@ ARG VERSION
 
 LABEL maintainer="wordpress-charmers@xxxxxxxxxxxxxxxxxxx"
 # Used by Launchpad OCI Recipe to tag version
-LABEL org.label-schema.version=${VERSION:-5.8.3}
+LABEL org.label-schema.version=${VERSION:-5.9.3}
 
 # Port 80 only, TLS will terminate elsewhere
 EXPOSE 80
diff --git a/config.yaml b/config.yaml
index 6af47e2..09ca037 100644
--- a/config.yaml
+++ b/config.yaml
@@ -2,7 +2,7 @@ options:
   image:
     type: string
     description: "The docker image to install. Required."
-    default: "wordpresscharmers/wordpress:v5.8.3-20.04"
+    default: "wordpresscharmers/wordpress:focal-5.9.3"
   image_user:
     type: string
     description: "Username to use for the configured image registry, if required"
diff --git a/image-builder/Makefile b/image-builder/Makefile
index 11c4542..824143c 100644
--- a/image-builder/Makefile
+++ b/image-builder/Makefile
@@ -1,5 +1,6 @@
 DIST_RELEASE ?= focal
-VERSION ?= 5.8.3
+DIST_DATE ?= 20.04
+VERSION ?= 5.9.3
 
 build-image:
 	@echo "Building the image."
@@ -7,7 +8,7 @@ build-image:
 		--no-cache=true \
 		--build-arg DIST_RELEASE=$(DIST_RELEASE) \
 		--build-arg VERSION=$(VERSION) \
-		-t wordpress:$(DIST_RELEASE)-$(VERSION) \
+		-t wordpress:v$(VERSION)-$(DIST_DATE) \
 		.
 lint: clean
 	@echo "Running flake8"