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

Proposed by Paul Collins
Status: Merged
Approved by: Haw Loeung
Approved revision: 80f8d72a8142b80b6f6c974bcd561836a425c6a2
Merged at revision: 7ba197ca5c1ee9b849efd071954e1ee939d5dd08
Proposed branch: ~pjdc/charm-k8s-mattermost/+git/charm-k8s-mattermost:default-image
Merge into: charm-k8s-mattermost:master
Diff against target: 61 lines (+16/-7)
2 files modified
README.md (+15/-6)
config.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Haw Loeung Approve
Canonical IS Reviewers Pending
Review via email: mp+392916@code.launchpad.net

Commit message

use default image mattermostcharmers/mattermost:edge, adjust README.md to suit

To post a comment you must log in.
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
Haw Loeung (hloeung) wrote :

LGTM

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

Change successfully merged at revision 7ba197ca5c1ee9b849efd071954e1ee939d5dd08

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 81f6a2a..08bd581 100644
3--- a/README.md
4+++ b/README.md
5@@ -27,7 +27,6 @@ Notes for deploying a test setup locally using microk8s:
6 sudo snap alias microk8s.kubectl kubectl
7 sudo snap install charmcraft
8 git clone https://git.launchpad.net/charm-k8s-mattermost
9- git clone https://git.launchpad.net/~mattermost-charmers/charm-k8s-mattermost/+git/image-build mattermost-image-build
10 make -C charm-k8s-mattermost mattermost.charm
11
12 microk8s.reset # Warning! Clean slate!
13@@ -35,13 +34,9 @@ Notes for deploying a test setup locally using microk8s:
14 microk8s.status --wait-ready
15 microk8s.config | juju add-k8s myk8s --client
16
17- # Build your Mattermost image
18- docker build -t localhost:32000/mattermost ./mattermost-image-build
19- docker push localhost:32000/mattermost
20-
21 juju bootstrap myk8s
22 juju add-model mattermost-test
23- juju deploy ./charm-k8s-mattermost/mattermost.charm --config mattermost_image_path=localhost:32000/mattermost:latest mattermost
24+ juju deploy ./charm-k8s-mattermost/mattermost.charm mattermost
25 juju wait
26 juju status
27
28@@ -70,6 +65,20 @@ know what the source addresses or address range is for the next step.
29 (In the case of postgresql, `--via` is needed so that the charm can
30 configure `pga_hba.conf` to let the k8s pods connect to the database.)
31
32+## Using a Custom Image
33+
34+ git clone https://git.launchpad.net/~mattermost-charmers/charm-k8s-mattermost/+git/image-build mattermost-image-build
35+ docker build -t localhost:32000/mattermost ./mattermost-image-build
36+ docker push localhost:32000/mattermost
37+
38+Then, to use your new image, either replace the `deploy` step above with
39+
40+ juju deploy ./charm-k8s-mattermost/mattermost.charm --config mattermost_image_path=localhost:32000/mattermost:latest mattermost
41+
42+or, if you've already deployed mattermost:
43+
44+ juju config mattermost mattermost_image_path=localhost:32000/mattermost:latest
45+
46 ## Authentication
47
48 This charm supports configuring [Ubuntu SSO](https://login.ubuntu.com)
49diff --git a/config.yaml b/config.yaml
50index 438cd45..34ac0a8 100644
51--- a/config.yaml
52+++ b/config.yaml
53@@ -40,7 +40,7 @@ options:
54 The location of the image to use, e.g. "registry.example.com/mattermost:v1".
55
56 This setting is required.
57- default: ''
58+ default: mattermostcharmers/mattermost:edge
59 mattermost_image_username:
60 type: string
61 description: |

Subscribers

People subscribed via source and target branches