bind-charmers team mailing list archive

[Barry Price <barry.price@xxxxxxxxxxxxx>]

Barry Price has proposed merging ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:bionic-default into charm-k8s-bind:master with ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:master as a prerequisite.

Commit message:
Make bionic the default series to allow recursion by default, and use dnsutils (x/b/f) rather than bind9-dnsutils (f)"

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/charm-k8s-bind/+merge/393299
-- 
Your team Bind Charmers is requested to review the proposed merge of ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:bionic-default into charm-k8s-bind:master.

diff --git a/Makefile b/Makefile
index 6e99731..9e0362c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DIST_RELEASE ?= focal
+DIST_RELEASE ?= bionic
 EXTRA_PACKAGES = ""
 
 blacken:
diff --git a/dockerfile b/dockerfile
index 00ff6e9..968d4fd 100644
--- a/dockerfile
+++ b/dockerfile
@@ -17,7 +17,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
 # Update all packages, remove cruft, install required packages
 RUN apt-get update && apt-get -y dist-upgrade \
     && apt-get --purge autoremove -y \
-    && apt-get install -y bind9 bind9-dnsutils git ${EXTRA_PKGS_TO_INSTALL}
+    && apt-get install -y bind9 dnsutils git ${EXTRA_PKGS_TO_INSTALL}
 
 # entrypoint script will configure Bind based on env variables
 # dns-check script will provide a readinessProbe