Merge ~mthaddon/charm-k8s-mattermost/+git/charm-k8s-mattermost:default-image-5.33 into charm-k8s-mattermost:master

Proposed by Tom Haddon
Status: Merged
Approved by: Junien Fridrick
Approved revision: 328ef0846fe95d1bae2224b8c73b85ed385cab19
Merged at revision: c0032d3c8c1c009ffc9dc8107599031f20dcae78
Proposed branch: ~mthaddon/charm-k8s-mattermost/+git/charm-k8s-mattermost:default-image-5.33
Merge into: charm-k8s-mattermost:master
Diff against target: 26 lines (+2/-2)
2 files modified
README.md (+1/-1)
config.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Junien Fridrick Approve
🤖 prod-jenkaas-is (community) continuous-integration Approve
Canonical IS Reviewers Pending
Review via email: mp+400858@code.launchpad.net

Commit message

Use image built from the OCI recipe on Launchpad and update readme to use preferred 'relate' for adding a relation

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (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 :

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 :
review: Approve (continuous-integration)
Revision history for this message
Junien Fridrick (axino) wrote :

+1

review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision c0032d3c8c1c009ffc9dc8107599031f20dcae78

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index e244a37..461b0f7 100644
3--- a/README.md
4+++ b/README.md
5@@ -22,7 +22,7 @@ Kubernetes model:
6
7 juju deploy cs:~postgresql-charmers/postgresql-k8s postgresql
8 juju deploy cs:~mattermost-charmers/mattermost --config juju-external-hostname=foo.internal
9- juju add-relation mattermost postgresql:db
10+ juju relate mattermost postgresql:db
11 juju expose mattermost
12
13 Once the deployment has completed and the "mattermost" workload state in `juju
14diff --git a/config.yaml b/config.yaml
15index 4716b7c..5827200 100644
16--- a/config.yaml
17+++ b/config.yaml
18@@ -42,7 +42,7 @@ options:
19 Switching to a newer image version will initiate an upgrade of Mattermost.
20
21 This setting is required.
22- default: mattermostcharmers/mattermost:5.33.3
23+ default: mattermostcharmers/mattermost:v5.33.3-20.04_edge
24 mattermost_image_username:
25 type: string
26 description: |

Subscribers

People subscribed via source and target branches