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

[Paul Collins]

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Haw Loeung (hloeung)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 7ba197ca5c1ee9b849efd071954e1ee939d5dd08

diff --git a/README.md b/README.md
index 81f6a2a..08bd581 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@ Notes for deploying a test setup locally using microk8s:
     sudo snap alias microk8s.kubectl kubectl
     sudo snap install charmcraft
     git clone https://git.launchpad.net/charm-k8s-mattermost
-    git clone https://git.launchpad.net/~mattermost-charmers/charm-k8s-mattermost/+git/image-build mattermost-image-build
     make -C charm-k8s-mattermost mattermost.charm
 
     microk8s.reset  # Warning! Clean slate!
@@ -35,13 +34,9 @@ Notes for deploying a test setup locally using microk8s:
     microk8s.status --wait-ready
     microk8s.config | juju add-k8s myk8s --client
 
-    # Build your Mattermost image
-    docker build -t localhost:32000/mattermost ./mattermost-image-build
-    docker push localhost:32000/mattermost
-    
     juju bootstrap myk8s
     juju add-model mattermost-test
-    juju deploy ./charm-k8s-mattermost/mattermost.charm --config mattermost_image_path=localhost:32000/mattermost:latest mattermost
+    juju deploy ./charm-k8s-mattermost/mattermost.charm mattermost
     juju wait
     juju status
 
@@ -70,6 +65,20 @@ know what the source addresses or address range is for the next step.
 (In the case of postgresql, `--via` is needed so that the charm can
 configure `pga_hba.conf` to let the k8s pods connect to the database.)
 
+## Using a Custom Image
+
+    git clone https://git.launchpad.net/~mattermost-charmers/charm-k8s-mattermost/+git/image-build mattermost-image-build
+    docker build -t localhost:32000/mattermost ./mattermost-image-build
+    docker push localhost:32000/mattermost
+
+Then, to use your new image, either replace the `deploy` step above with
+
+    juju deploy ./charm-k8s-mattermost/mattermost.charm --config mattermost_image_path=localhost:32000/mattermost:latest mattermost
+
+or, if you've already deployed mattermost:
+
+    juju config mattermost mattermost_image_path=localhost:32000/mattermost:latest
+
 ## Authentication
 
 This charm supports configuring [Ubuntu SSO](https://login.ubuntu.com)
diff --git a/config.yaml b/config.yaml
index 438cd45..34ac0a8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -40,7 +40,7 @@ options:
           The location of the image to use, e.g. "registry.example.com/mattermost:v1".
 
           This setting is required.
-        default: ''
+        default: mattermostcharmers/mattermost:edge
     mattermost_image_username:
         type: string
         description: |