charm-k8s-bind

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

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

Commit message

Move required packages into the dockerfile instead of making them optional via Makefile

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, thx

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

Change successfully merged at revision 629267cb5041652a8f967266e9167ae1abd79fe5

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 66fc8ed..6577169 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -1,5 +1,5 @@
6 DIST_RELEASE ?= focal
7-DOCKER_DEPS = bind9 bind9-dnsutils git
8+EXTRA_PACKAGES = ""
9
10 blacken:
11 @echo "Normalising python layout with black."
12@@ -38,7 +38,7 @@ image-build: image-lint
13 @docker build \
14 --no-cache=true \
15 --build-arg BUILD_DATE=$$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
16- --build-arg PKGS_TO_INSTALL='$(DOCKER_DEPS)' \
17+ --build-arg EXTRA_PKGS_TO_INSTALL='$(EXTRA_PACKAGES)' \
18 --build-arg DIST_RELEASE=$(DIST_RELEASE) \
19 -t bind:$(DIST_RELEASE)-latest \
20 .
21diff --git a/dockerfile b/dockerfile
22index 2e580d4..e4922e0 100644
23--- a/dockerfile
24+++ b/dockerfile
25@@ -17,7 +17,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
26 # Update all packages, remove cruft, install required packages
27 RUN apt-get update && apt-get -y dist-upgrade \
28 && apt-get --purge autoremove -y \
29- && apt-get install -y ${PKGS_TO_INSTALL}
30+ && apt-get install -y bind9 bind9-dnsutils git ${EXTRA_PKGS_TO_INSTALL}
31
32 # entrypoint script will configure Bind based on env variables
33 # dns-check script will provide a readinessProbe

Subscribers

People subscribed via source and target branches

to all changes: