Merge ~athos-ribeiro/ubuntu-docker-images/+git/bind9:9.16-20.04-lp1955680 into ~ubuntu-docker-images/ubuntu-docker-images/+git/bind9:9.16-20.04

[Athos Ribeiro]

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP and for the thorough investigation, Athos.

I played around with your proposed changes and I'm happy with the results. I also agree with them, so I'm a +1 here. LGTM.

review: Approve

diff --git a/Dockerfile b/Dockerfile
index da6937b..62e0f40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,16 +13,17 @@ RUN set -eux; \
 		; \
 	DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \
 	rm -rf /var/lib/apt/lists/*; \
+# prepare runtime directories
+	install -d -m 0755 -o bind -g bind /run/named; \
 # smoke test
 	named -v; \
 # create manifest
 	mkdir -p /usr/share/rocks; \
 	(echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query
 
-USER bind
 VOLUME ["/var/cache/bind", "/var/lib/bind"]
 
-EXPOSE 53
+EXPOSE 53/tcp 53/udp 953/tcp
 
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index c0cf2fd..4c8d14d 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -14,7 +14,7 @@ fi
 if [[ -z "${1}" ]]; then
     echo "Starting named..."
     echo "exec $(which named) -g \"${EXTRA_ARGS}\""
-    exec $(command -v named) -g ${EXTRA_ARGS}
+    exec $(command -v named) -u bind -g ${EXTRA_ARGS}
 else
     exec "${@}"
 fi
diff --git a/examples/README.md b/examples/README.md
index d69b8a8..067b660 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -37,7 +37,7 @@ $ microk8s enable dns storage
 Apply the `microk8s-deployments.yml`:
 
 ```
-$ microk8s kubectl apply -f microk8s-deployments.yml
+$ microk8s kubectl apply -f bind9-deployment.yml
 ```
 
-Bind9 will be listening on port `53` in your host.
+Bind9 will be listening on port `5353` in your host.
diff --git a/examples/bind9-deployment.yml b/examples/bind9-deployment.yml
index 72cc563..551f1f2 100644
--- a/examples/bind9-deployment.yml
+++ b/examples/bind9-deployment.yml
@@ -9,7 +9,14 @@ spec:
   selector:
     app: bind9
   ports:
-  - port: 53
+  - protocol: TCP
+    port: 5353
+    targetPort: 53
+    name: bind9-tcp
+  - protocol: UDP
+    port: 5353
+    targetPort: 53
+    name: bind9
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -31,5 +38,6 @@ spec:
         env:
         ports:
         - containerPort: 53
-          name: bind9
           protocol: TCP
+        - containerPort: 53
+          protocol: UDP