From bd5e93a28489c704f3b9cc0e7b51d62fae033f0b Mon Sep 17 00:00:00 2001 From: ChrisP-Git Date: Mon, 20 Mar 2023 18:59:02 +0100 Subject: [PATCH 1/6] 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 5748a2859c15f1ff6701cfb4f0733974065d42f6 Mon Sep 17 00:00:00 2001 From: ChrisP-Git Date: Fri, 7 Apr 2023 11:59:03 +0200 Subject: [PATCH 2/6] 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 3/6] 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 4/6] 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 f44b7d9e59e5e5a4c3ac1e424cd500aec429853e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 11 Apr 2023 20:44:31 +0200 Subject: [PATCH 5/6] 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 6/6] 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..."