Merge pull request #8661 from jpbetz/docker-dns-srv-fix

Dockerfile: Improve file permissions for docker build images using bind9
etcd-io · Oct 7, 2017 · a68a3dc · a68a3dc
2 parents b766a26 + abc81d0
commit a68a3dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/e2e/docker-dns-srv/Dockerfile b/e2e/docker-dns-srv/Dockerfile
@@ -2,16 +2,17 @@ FROM golang:1.9.1-stretch
 LABEL Description="Image for etcd DNS SRV testing"
 
 RUN apt update -y \
-  && apt install -y \
+  && apt install -y -q \
   bind9 \
   dnsutils
 
-RUN mkdir /var/bind
-RUN chown bind /var/bind
+RUN mkdir -p /var/bind /etc/bind
+RUN chown root:bind /var/bind /etc/bind
 ADD Procfile /Procfile
 ADD run.sh /run.sh
 
 ADD named.conf etcd.zone rdns.zone /etc/bind/
+RUN chown root:bind /etc/bind/named.conf /etc/bind/etcd.zone /etc/bind/rdns.zone
 ADD resolv.conf /etc/resolv.conf
 
 RUN go get github.com/mattn/goreman

diff --git a/e2e/docker-dns/Dockerfile b/e2e/docker-dns/Dockerfile
@@ -2,16 +2,17 @@ FROM golang:1.9.1-stretch
 LABEL Description="Image for etcd DNS testing"
 
 RUN apt update -y \
-  && apt install -y \
+  && apt install -y -q \
   bind9 \
   dnsutils
 
-RUN mkdir /var/bind
-RUN chown bind /var/bind
+RUN mkdir -p /var/bind /etc/bind
+RUN chown root:bind /var/bind /etc/bind
 ADD Procfile.tls /Procfile.tls
 ADD run.sh /run.sh
 
 ADD named.conf etcd.zone rdns.zone /etc/bind/
+RUN chown root:bind /etc/bind/named.conf /etc/bind/etcd.zone /etc/bind/rdns.zone
 ADD resolv.conf /etc/resolv.conf
 
 RUN go get github.com/mattn/goreman