bind-charmers team mailing list archive

[Barry Price <barry.price@xxxxxxxxxxxxx>]

Barry Price has proposed merging ~barryprice/charm-k8s-bind/+git/bind-k8s-image-builder:master into ~bind-charmers/charm-k8s-bind/+git/bind-k8s-image-builder:master.

Commit message:
Use a record we control for testing, fix runtime arguments for named itself

Requested reviews:
  Canonical IS Reviewers (canonical-is-reviewers)
  Bind Charmers (bind-charmers)

For more details, see:
https://code.launchpad.net/~barryprice/charm-k8s-bind/+git/bind-k8s-image-builder/+merge/388360
-- 
Your team Bind Charmers is requested to review the proposed merge of ~barryprice/charm-k8s-bind/+git/bind-k8s-image-builder:master into ~bind-charmers/charm-k8s-bind/+git/bind-k8s-image-builder:master.

diff --git a/Dockerfile b/Dockerfile
index 548bae5..8013088 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,4 +30,4 @@ EXPOSE 53/udp
 EXPOSE 53/tcp
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-CMD /usr/sbin/named -f -u bind
+CMD /usr/sbin/named -f -u bind -c /etc/bind/named.conf
diff --git a/files/dns-check.sh b/files/dns-check.sh
index 643fb94..ca4a5a0 100644
--- a/files/dns-check.sh
+++ b/files/dns-check.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-TEST_DOMAIN="example.com"
+TEST_DOMAIN="ddebs.ubuntu.com."
 NSLOOKUP_PATH="/usr/bin/nslookup"
 OUR_ADDRESS="127.0.0.1"