Merge ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:master into charm-k8s-bind:master

[Barry Price]

Use the Dockerhub image by default, update the README accordingly

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

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

[Tom Haddon (mthaddon)]

LGTM

review: Approve

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

Change successfully merged at revision 9216c8f618481053185bba96c5b32e6478345f61

diff --git a/README.md b/README.md
index a5ba4ae..ff1c869 100644
--- a/README.md
+++ b/README.md
@@ -26,28 +26,32 @@ Notes for deploying a test setup locally using microk8s:
     sudo snap install juju-wait --classic
     sudo snap install microk8s --classic
     sudo snap alias microk8s.kubectl kubectl
-    sudo snap install charmcraft
-    git clone https://git.launchpad.net/charm-k8s-bind
-    make bind.charm
 
     microk8s.reset  # Warning! Clean slate!
     microk8s.enable dns dashboard registry storage
     microk8s.status --wait-ready
     microk8s.config | juju add-k8s myk8s --client
 
-    # Build your Bind image
-    make build-image
-    docker push localhost:32000/bind
-    
     juju bootstrap myk8s
     juju add-model bind-test
-    juju deploy ./bind.charm --config bind_image_path=localhost:32000/bind:latest bind
+
+    #1. Either deploy with the default image from Dockerhub:
+    juju deploy cs:~bind-charmers/bind
+
+    #2. Or optionally build your own image locally and deploy with that
+    sudo snap install charmcraft
+    git clone https://git.launchpad.net/charm-k8s-bind
+    cd charm-k8s-bind
+    make image-build
+    docker push localhost:32000/bind
+    juju deploy cs:~bind-charmers/bind --config bind_image_path=localhost:32000/bind:latest bind
+
     juju wait
     juju status
 
-Assuming you're using the image as built locally from this repo, the charm will
-deploy bind with its stock Ubuntu package configuration, which will forward all
-queries to root name servers.
+Assuming you're using the image from dockerhub, or an image built locally from
+this repo without changes, the charm will deploy bind with its stock Ubuntu
+package configuration, which will forward all queries to root name servers.
 
 DNSSEC is also enabled by default.
 
diff --git a/config.yaml b/config.yaml
index 408ae9d..214ab0c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -5,7 +5,7 @@ options:
         The location of the image to use, e.g. "registry.example.com/bind:v1".
 
         This setting is required.
-    default: ""
+    default: "bindcharmers/bind:edge"
   bind_image_username:
     type: string
     description: "Username to use for the configured image registry, if required"
@@ -40,7 +40,7 @@ options:
     description: |
       Proxy address to set in the environment, e.g. http://192.168.1.1:8080
       Used to clone the configuration files from custom_config_repo, if set.
-      If a username/password is required, they can be embedded in the proxy 
+      If a username/password is required, they can be embedded in the proxy
       address e.g. http://username:password@192.168.1.1:8080
       Traffic is expected to be HTTPS, but this will also work for HTTP.
     default: ""