← Back to team overview

bind-charmers team mailing list archive

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

 

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

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

Requested reviews:
  Bind Charmers (bind-charmers)

For more details, see:
https://code.launchpad.net/~barryprice/charm-k8s-bind/+git/charm-k8s-bind/+merge/393097
-- 
Your team Bind Charmers is requested to review the proposed merge of ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:master into charm-k8s-bind:master.
diff --git a/Makefile b/Makefile
index 66fc8ed..6577169 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 DIST_RELEASE ?= focal
-DOCKER_DEPS = bind9 bind9-dnsutils git
+EXTRA_PACKAGES = ""
 
 blacken:
 	@echo "Normalising python layout with black."
@@ -38,7 +38,7 @@ image-build: image-lint
 	@docker build \
 		--no-cache=true \
 		--build-arg BUILD_DATE=$$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
-		--build-arg PKGS_TO_INSTALL='$(DOCKER_DEPS)' \
+		--build-arg EXTRA_PKGS_TO_INSTALL='$(EXTRA_PACKAGES)' \
 		--build-arg DIST_RELEASE=$(DIST_RELEASE) \
 		-t bind:$(DIST_RELEASE)-latest \
 		.
diff --git a/dockerfile b/dockerfile
index 2e580d4..e4922e0 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 ${PKGS_TO_INSTALL}
+    && apt-get install -y bind9 bind9-dnsutils git ${EXTRA_PKGS_TO_INSTALL}
 
 # entrypoint script will configure Bind based on env variables
 # dns-check script will provide a readinessProbe

Follow ups