charm-k8s-bind

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

  1. Git
  2. lp:~barryprice/charm-k8s-bind/+git/charm-k8s-bind
  3. bionic-default
  4. Merge into master
Proposed by Barry Price
Status: Merged
Approved by: Tom Haddon
Approved revision: fe6d88c551399734a0653f30433d6b85a46838cf
Merged at revision: dcc53cfd92ba9a5b8941d6b8f096a41755859af3
Proposed branch: ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:bionic-default
Merge into: charm-k8s-bind:master
Prerequisite: ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:master
Diff against target: 23 lines (+2/-2)
2 files modified
Makefile (+1/-1)
dockerfile (+1/-1)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+393299@code.launchpad.net

Commit message

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

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
Tom Haddon (mthaddon) wrote :

LGTM

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

Change successfully merged at revision dcc53cfd92ba9a5b8941d6b8f096a41755859af3

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 6e99731..9e0362c 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -1,4 +1,4 @@
6-DIST_RELEASE ?= focal
7+DIST_RELEASE ?= bionic
8 EXTRA_PACKAGES = ""
9
10 blacken:
11diff --git a/dockerfile b/dockerfile
12index 00ff6e9..968d4fd 100644
13--- a/dockerfile
14+++ b/dockerfile
15@@ -17,7 +17,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
16 # Update all packages, remove cruft, install required packages
17 RUN apt-get update && apt-get -y dist-upgrade \
18 && apt-get --purge autoremove -y \
19- && apt-get install -y bind9 bind9-dnsutils git ${EXTRA_PKGS_TO_INSTALL}
20+ && apt-get install -y bind9 dnsutils git ${EXTRA_PKGS_TO_INSTALL}
21
22 # entrypoint script will configure Bind based on env variables
23 # dns-check script will provide a readinessProbe

Subscribers

People subscribed via source and target branches

to all changes: