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

Proposed by Athos Ribeiro
Status: Merged
Merged at revision: b9552e3589bf43c894fdbc7cf982b3473b67108a
Proposed branch: ~athos-ribeiro/ubuntu-docker-images/+git/bind9:9.16-21.10-lp1955680
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/bind9:9.16-21.10
Diff against target: 79 lines (+16/-7)
4 files modified
Dockerfile (+3/-2)
docker-entrypoint.sh (+1/-1)
examples/README.md (+2/-2)
examples/bind9-deployment.yml (+10/-2)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior Approve
Bryce Harrington Pending
Canonical Server Pending
Review via email: mp+414928@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

I already reviewed the changes for the 20.04 image; these are identical (but for 21.10), so: LGTM, +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Dockerfile b/Dockerfile
index 9f84af0..bfd6966 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,16 +13,17 @@ RUN set -eux; \
13 ; \13 ; \
14 DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \14 DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \
15 rm -rf /var/lib/apt/lists/*; \15 rm -rf /var/lib/apt/lists/*; \
16# prepare runtime directories
17 install -d -m 0755 -o bind -g bind /run/named; \
16# smoke test18# smoke test
17 named -v; \19 named -v; \
18# create manifest20# create manifest
19 mkdir -p /usr/share/rocks; \21 mkdir -p /usr/share/rocks; \
20 (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.query22 (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
2123
22USER bind
23VOLUME ["/var/cache/bind", "/var/lib/bind"]24VOLUME ["/var/cache/bind", "/var/lib/bind"]
2425
25EXPOSE 5326EXPOSE 53/tcp 53/udp 953/tcp
2627
27COPY docker-entrypoint.sh /usr/local/bin/28COPY docker-entrypoint.sh /usr/local/bin/
28ENTRYPOINT ["docker-entrypoint.sh"]29ENTRYPOINT ["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
14if [[ -z "${1}" ]]; then14if [[ -z "${1}" ]]; then
15 echo "Starting named..."15 echo "Starting named..."
16 echo "exec $(which named) -g \"${EXTRA_ARGS}\""16 echo "exec $(which named) -g \"${EXTRA_ARGS}\""
17 exec $(command -v named) -g ${EXTRA_ARGS}17 exec $(command -v named) -u bind -g ${EXTRA_ARGS}
18else18else
19 exec "${@}"19 exec "${@}"
20fi20fi
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
37Apply the `microk8s-deployments.yml`:37Apply the `microk8s-deployments.yml`:
3838
39```39```
40$ microk8s kubectl apply -f microk8s-deployments.yml40$ microk8s kubectl apply -f bind9-deployment.yml
41```41```
4242
43Bind9 will be listening on port `53` in your host.43Bind9 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:
9 selector:9 selector:
10 app: bind910 app: bind9
11 ports:11 ports:
12 - port: 5312 - protocol: TCP
13 port: 5353
14 targetPort: 53
15 name: bind9-tcp
16 - protocol: UDP
17 port: 5353
18 targetPort: 53
19 name: bind9
13---20---
14apiVersion: apps/v121apiVersion: apps/v1
15kind: Deployment22kind: Deployment
@@ -31,5 +38,6 @@ spec:
31 env:38 env:
32 ports:39 ports:
33 - containerPort: 5340 - containerPort: 53
34 name: bind9
35 protocol: TCP41 protocol: TCP
42 - containerPort: 53
43 protocol: UDP

Subscribers

People subscribed via source and target branches