charm-k8s-wordpress

Merge ~jsimpso/charm-k8s-wordpress:master into charm-k8s-wordpress:master

  1. Git
  2. lp:~jsimpso/charm-k8s-wordpress
  3. master
  4. Merge into master
Proposed by James Simpson
Status: Merged
Approved by: Tom Haddon
Approved revision: e7ce92dec84c65c1c4e32ae41493bb3ed76a62e2
Merged at revision: f8c0aed03c272a8904dcab8ebecacfa0f244816c
Proposed branch: ~jsimpso/charm-k8s-wordpress:master
Merge into: charm-k8s-wordpress:master
Diff against target: 47 lines (+5/-4)
3 files modified
Dockerfile (+1/-1)
config.yaml (+1/-1)
image-builder/Makefile (+3/-2)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-is (community) continuous-integration Approve
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+420141@code.launchpad.net

Commit message

Bump wordpress version to 5.9.3

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

FAILED: Continuous integration, rev:3e1f634eb03cf631defc768af7c5aec372b76b4c

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~jsimpso/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/420141/+edit-commit-message

https://jenkins.canonical.com/is/job/lp-charm-k8s-wordpress-ci/29/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/181/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/822459/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-wordpress-ci/29//rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

PASSED: Continuous integration, rev:3e1f634eb03cf631defc768af7c5aec372b76b4c
https://jenkins.canonical.com/is/job/lp-charm-k8s-wordpress-ci/30/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/182/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/822499/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-wordpress-ci/30//rebuild

review: Approve (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

PASSED: Continuous integration, rev:2cd58fe759f33fb8c24ab685bfea7915ad3fa0c7
https://jenkins.canonical.com/is/job/lp-charm-k8s-wordpress-ci/31/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/183/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/823098/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-wordpress-ci/31//rebuild

review: Approve (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

PASSED: Continuous integration, rev:e7ce92dec84c65c1c4e32ae41493bb3ed76a62e2
https://jenkins.canonical.com/is/job/lp-charm-k8s-wordpress-ci/32/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/184/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/823435/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-wordpress-ci/32//rebuild

review: Approve (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision f8c0aed03c272a8904dcab8ebecacfa0f244816c

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index a338c56..a394f4d 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -106,7 +106,7 @@ ARG VERSION
6
7 LABEL maintainer="wordpress-charmers@lists.launchpad.net"
8 # Used by Launchpad OCI Recipe to tag version
9-LABEL org.label-schema.version=${VERSION:-5.8.3}
10+LABEL org.label-schema.version=${VERSION:-5.9.3}
11
12 # Port 80 only, TLS will terminate elsewhere
13 EXPOSE 80
14diff --git a/config.yaml b/config.yaml
15index 6af47e2..fadc47f 100644
16--- a/config.yaml
17+++ b/config.yaml
18@@ -2,7 +2,7 @@ options:
19 image:
20 type: string
21 description: "The docker image to install. Required."
22- default: "wordpresscharmers/wordpress:v5.8.3-20.04"
23+ default: "wordpresscharmers/wordpress:v5.9.3-20.04_edge"
24 image_user:
25 type: string
26 description: "Username to use for the configured image registry, if required"
27diff --git a/image-builder/Makefile b/image-builder/Makefile
28index 11c4542..824143c 100644
29--- a/image-builder/Makefile
30+++ b/image-builder/Makefile
31@@ -1,5 +1,6 @@
32 DIST_RELEASE ?= focal
33-VERSION ?= 5.8.3
34+DIST_DATE ?= 20.04
35+VERSION ?= 5.9.3
36
37 build-image:
38 @echo "Building the image."
39@@ -7,7 +8,7 @@ build-image:
40 --no-cache=true \
41 --build-arg DIST_RELEASE=$(DIST_RELEASE) \
42 --build-arg VERSION=$(VERSION) \
43- -t wordpress:$(DIST_RELEASE)-$(VERSION) \
44+ -t wordpress:v$(VERSION)-$(DIST_DATE) \
45 .
46 lint: clean
47 @echo "Running flake8"

Subscribers

People subscribed via source and target branches