From 0b4476dc2634932eb259a924a7757ef8dbb78b2a Mon Sep 17 00:00:00 2001 From: ChrisP-Git Date: Mon, 20 Mar 2023 16:53:48 +0100 Subject: [PATCH 01/10] focal-20230308 & Webmin 2.020 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fab5aab..a3e7a5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ -FROM ubuntu:focal-20200423 AS add-apt-repositories +FROM ubuntu:focal-20230308 AS add-apt-repositories RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg \ && apt-key adv --fetch-keys http://www.webmin.com/jcameron-key.asc \ && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list -FROM ubuntu:focal-20200423 +FROM ubuntu:focal-20230308 LABEL maintainer="sameer@damagehead.com" ENV BIND_USER=bind \ - BIND_VERSION=9.16.1 \ - WEBMIN_VERSION=1.941 \ + BIND_VERSION=9.16.37 \ + WEBMIN_VERSION=2.020 \ DATA_DIR=/data COPY --from=add-apt-repositories /etc/apt/trusted.gpg /etc/apt/trusted.gpg From bd5e93a28489c704f3b9cc0e7b51d62fae033f0b Mon Sep 17 00:00:00 2001 From: ChrisP-Git Date: Mon, 20 Mar 2023 18:59:02 +0100 Subject: [PATCH 02/10] Switch to debian --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3e7a5f..e5dd47a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,12 @@ -FROM ubuntu:focal-20230308 AS add-apt-repositories +FROM debian:bullseye-20230227 AS add-apt-repositories RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg \ - && apt-key adv --fetch-keys http://www.webmin.com/jcameron-key.asc \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg ca-certificates apt-utils \ + && apt-get update \ + && apt-key adv --fetch-keys https://webmin.com/jcameron-key.asc \ && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list -FROM ubuntu:focal-20230308 +FROM debian:bullseye-20230227 LABEL maintainer="sameer@damagehead.com" From 96671395efbfdb38b2f85b7a779cd32ac257e9c6 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 7 Apr 2023 11:55:19 +0200 Subject: [PATCH 03/10] Updated Webmin 2.021 --- Dockerfile | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3e7a5f..d3d09ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,36 +1,25 @@ -FROM ubuntu:focal-20230308 AS add-apt-repositories - +FROM debian:bullseye-20230320 AS add-apt-repositories RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg \ - && apt-key adv --fetch-keys http://www.webmin.com/jcameron-key.asc \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg ca-certificates apt-utils \ + && apt-get update \ + && apt-key adv --fetch-keys https://webmin.com/jcameron-key.asc \ && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list - -FROM ubuntu:focal-20230308 - +FROM debian:bullseye-20230320 LABEL maintainer="sameer@damagehead.com" - ENV BIND_USER=bind \ BIND_VERSION=9.16.37 \ - WEBMIN_VERSION=2.020 \ + WEBMIN_VERSION=2.021 \ DATA_DIR=/data - COPY --from=add-apt-repositories /etc/apt/trusted.gpg /etc/apt/trusted.gpg - COPY --from=add-apt-repositories /etc/apt/sources.list /etc/apt/sources.list - RUN rm -rf /etc/apt/apt.conf.d/docker-gzip-indexes \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ bind9=1:${BIND_VERSION}* bind9-host=1:${BIND_VERSION}* dnsutils \ webmin=${WEBMIN_VERSION}* \ && rm -rf /var/lib/apt/lists/* - COPY entrypoint.sh /sbin/entrypoint.sh - RUN chmod 755 /sbin/entrypoint.sh - EXPOSE 53/udp 53/tcp 10000/tcp - ENTRYPOINT ["/sbin/entrypoint.sh"] - CMD ["/usr/sbin/named"] From 5748a2859c15f1ff6701cfb4f0733974065d42f6 Mon Sep 17 00:00:00 2001 From: ChrisP-Git Date: Fri, 7 Apr 2023 11:59:03 +0200 Subject: [PATCH 04/10] Webmin 2.021 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e5dd47a..b99e952 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-20230227 AS add-apt-repositories +FROM debian:bullseye-20230320 AS add-apt-repositories RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg ca-certificates apt-utils \ @@ -6,13 +6,13 @@ RUN apt-get update \ && apt-key adv --fetch-keys https://webmin.com/jcameron-key.asc \ && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list -FROM debian:bullseye-20230227 +FROM debian:bullseye-20230320 LABEL maintainer="sameer@damagehead.com" ENV BIND_USER=bind \ BIND_VERSION=9.16.37 \ - WEBMIN_VERSION=2.020 \ + WEBMIN_VERSION=2.021 \ DATA_DIR=/data COPY --from=add-apt-repositories /etc/apt/trusted.gpg /etc/apt/trusted.gpg From 4190e116deb0077071bd6b6a231e68378676d70c Mon Sep 17 00:00:00 2001 From: ChrisP-Git Date: Fri, 7 Apr 2023 17:40:47 +0200 Subject: [PATCH 05/10] Fix configuration application Systemctl was missing --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b99e952..368b00a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-20230320 AS add-apt-repositories RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg ca-certificates apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y systemctl gnupg ca-certificates apt-utils \ && apt-get update \ && apt-key adv --fetch-keys https://webmin.com/jcameron-key.asc \ && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list From 9146ab12728d1d701d2791ecb7432c2d5b17b65a Mon Sep 17 00:00:00 2001 From: ChrisP-Git Date: Fri, 7 Apr 2023 22:12:48 +0200 Subject: [PATCH 06/10] fix ntp --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 368b00a..0fdaf53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-20230320 AS add-apt-repositories RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y systemctl gnupg ca-certificates apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg ca-certificates apt-utils \ && apt-get update \ && apt-key adv --fetch-keys https://webmin.com/jcameron-key.asc \ && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list @@ -23,7 +23,7 @@ RUN rm -rf /etc/apt/apt.conf.d/docker-gzip-indexes \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ bind9=1:${BIND_VERSION}* bind9-host=1:${BIND_VERSION}* dnsutils \ - webmin=${WEBMIN_VERSION}* \ + webmin=${WEBMIN_VERSION}* systemctl \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /sbin/entrypoint.sh From 5baf20e3887e4ed72587a2c8e480b653497c429e Mon Sep 17 00:00:00 2001 From: ChrisP-Git Date: Tue, 11 Apr 2023 20:49:20 +0200 Subject: [PATCH 07/10] fix System Time module --- Dockerfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d3d09ca..0036ef4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,37 @@ FROM debian:bullseye-20230320 AS add-apt-repositories + RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg ca-certificates apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y systemctl gnupg ca-certificates apt-utils ntp \ && apt-get update \ && apt-key adv --fetch-keys https://webmin.com/jcameron-key.asc \ && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list + FROM debian:bullseye-20230320 + LABEL maintainer="sameer@damagehead.com" + ENV BIND_USER=bind \ BIND_VERSION=9.16.37 \ WEBMIN_VERSION=2.021 \ DATA_DIR=/data + COPY --from=add-apt-repositories /etc/apt/trusted.gpg /etc/apt/trusted.gpg + COPY --from=add-apt-repositories /etc/apt/sources.list /etc/apt/sources.list + RUN rm -rf /etc/apt/apt.conf.d/docker-gzip-indexes \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ bind9=1:${BIND_VERSION}* bind9-host=1:${BIND_VERSION}* dnsutils \ webmin=${WEBMIN_VERSION}* \ && rm -rf /var/lib/apt/lists/* + COPY entrypoint.sh /sbin/entrypoint.sh + RUN chmod 755 /sbin/entrypoint.sh + EXPOSE 53/udp 53/tcp 10000/tcp + ENTRYPOINT ["/sbin/entrypoint.sh"] + CMD ["/usr/sbin/named"] From f44b7d9e59e5e5a4c3ac1e424cd500aec429853e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 11 Apr 2023 20:44:31 +0200 Subject: [PATCH 08/10] fix ntp --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0fdaf53..0036ef4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bullseye-20230320 AS add-apt-repositories RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg ca-certificates apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y systemctl gnupg ca-certificates apt-utils ntp \ && apt-get update \ && apt-key adv --fetch-keys https://webmin.com/jcameron-key.asc \ && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list @@ -23,7 +23,7 @@ RUN rm -rf /etc/apt/apt.conf.d/docker-gzip-indexes \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ bind9=1:${BIND_VERSION}* bind9-host=1:${BIND_VERSION}* dnsutils \ - webmin=${WEBMIN_VERSION}* systemctl \ + webmin=${WEBMIN_VERSION}* \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /sbin/entrypoint.sh From 964062f0a6a81b2e53cb607414079f61ccb419a2 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 30 Mar 2024 22:50:42 +0100 Subject: [PATCH 09/10] Upgrade to bookworm --- Dockerfile | 20 ++++++-------------- entrypoint.sh | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0036ef4..0740b7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,21 @@ -FROM debian:bullseye-20230320 AS add-apt-repositories +FROM debian:bookworm AS add-apt-repositories RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y systemctl gnupg ca-certificates apt-utils ntp \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y systemctl curl gnupg ntp apt-utils \ && apt-get update \ - && apt-key adv --fetch-keys https://webmin.com/jcameron-key.asc \ - && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list - -FROM debian:bullseye-20230320 + && curl -o setup-repos.sh https://raw.githubusercontent.com/webmin/webmin/master/setup-repos.sh \ + && sh setup-repos.sh --force \ + && apt-get update LABEL maintainer="sameer@damagehead.com" ENV BIND_USER=bind \ - BIND_VERSION=9.16.37 \ - WEBMIN_VERSION=2.021 \ DATA_DIR=/data -COPY --from=add-apt-repositories /etc/apt/trusted.gpg /etc/apt/trusted.gpg - -COPY --from=add-apt-repositories /etc/apt/sources.list /etc/apt/sources.list - RUN rm -rf /etc/apt/apt.conf.d/docker-gzip-indexes \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - bind9=1:${BIND_VERSION}* bind9-host=1:${BIND_VERSION}* dnsutils \ - webmin=${WEBMIN_VERSION}* \ + bind9 bind9-host dnsutils webmin \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /sbin/entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh index 3381555..b0aba89 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -128,7 +128,7 @@ if [[ -z ${1} ]]; then first_init set_root_passwd echo "Starting webmin..." - /etc/init.d/webmin start + systemctl start webmin fi echo "Starting named..." From a19449fd17ce55ccff64bf2ddb6d94d95810b474 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 1 Apr 2024 18:13:21 +0200 Subject: [PATCH 10/10] Fix named.service call within webmin --- Makefile | 2 +- docker-compose.yml | 2 +- entrypoint.sh | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 77afd08..5af55bb 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ all: build build: - @docker build --tag=sameersbn/bind . + @docker build --tag=crispychrispe/bind9-webmin2 . diff --git a/docker-compose.yml b/docker-compose.yml index c44872e..66f8e44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: bind: restart: always - image: sameersbn/bind:9.16.1-20200524 + image: crispychrispe/bind9-webmin2:latest ports: - "53:53/udp" - "53:53/tcp" diff --git a/entrypoint.sh b/entrypoint.sh index b0aba89..48e85c4 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -95,6 +95,10 @@ create_bind_cache_dir() { chown root:${BIND_USER} /var/cache/bind } +fix_bind_servicename() { + sed -i 's/bind9.service/named.service/g' /etc/webmin/bind8/config +} + first_init() { if [ ! -f /data/.initialized ]; then set_webmin_redirect_port @@ -127,6 +131,7 @@ if [[ -z ${1} ]]; then create_webmin_data_dir first_init set_root_passwd + fix_bind_servicename echo "Starting webmin..." systemctl start webmin fi