Merge remote-tracking branch 'origin/bookworm'

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="[email protected]"
 
 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

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..."