feat(web): update mailserver-admin to 5.9.0

Author: jeboehm

.github/bin/create_banner.sh

@@ -11,6 +11,10 @@ REVISION="$1"
 VERSION="$2"
 TARGETS="filter mda mta unbound web"
 
+echo "Creating version hint for mailserver-admin.."
+mkdir -p target/web/rootfs/opt/admin/
+echo "${VERSION}" >target/web/rootfs/opt/admin/DMS-VERSION
+
 for TARGET in $TARGETS; do
 	echo "Creating banner for $TARGET container.."
 

.github/workflows/build.yml

@@ -91,7 +91,7 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
       - name: Create banner
-        run: .github/bin/create_banner.sh ${{ github.sha }} ${{ github.ref }}
+        run: .github/bin/create_banner.sh ${{ github.sha }} ${{ github.ref_name }}
       - name: Build and push Docker image
         if: ${{ github.event_name != 'pull_request' }}
         id: build-and-push

Makefile

@@ -42,7 +42,6 @@ up: .env
 .PHONY: fixtures
 fixtures:
 	$(COMPOSE_PRODUCTION) exec web /opt/admin/bin/console system:check --wait
-	sleep 5 # TODO: remove when admin implemented better checks
 	$(COMPOSE_PRODUCTION) exec web /opt/admin/bin/console domain:add example.com
 	$(COMPOSE_PRODUCTION) exec web /opt/admin/bin/console domain:add example.org
 	$(COMPOSE_PRODUCTION) exec web /opt/admin/bin/console user:add --admin --password=changeme --enable admin example.com

deploy/compose/web.yaml

@@ -19,7 +19,6 @@ services:
       - redis
     read_only: true
     tmpfs:
-      - /var/www/html/autoconfig:mode=0777
       - /opt/admin/var/cache/prod:mode=0777
       - /opt/admin/var/log:mode=0777
       - /opt/roundcube/temp:mode=0777

deploy/kustomize/web/deployment.yaml

@@ -97,10 +97,6 @@ spec:
             - name: tmp
               mountPath: /opt/roundcube/logs
               subPath: rc-logs
-            - name: tmp
-              mountPath: /var/www/html/autoconfig
-              subPath: autoconfig
-              readOnly: true
       initContainers:
         - name: prepare-service
           image: jeboehm/mailserver-web:latest
@@ -142,9 +138,6 @@ spec:
             - name: tmp
               mountPath: /opt/roundcube/logs
               subPath: rc-logs
-            - name: tmp
-              mountPath: /var/www/html/autoconfig
-              subPath: autoconfig
       securityContext:
         fsGroup: 1000
         fsGroupChangePolicy: OnRootMismatch

target/web/Dockerfile

@@ -18,8 +18,6 @@ ENV MYSQL_HOST=db \
     WEB_PHP_ADDRESS=127.0.0.1:9000 \
     SUPPORT_URL=https://github.com/jeboehm/docker-mailserver \
     MAILNAME=mail.example.com \
-    LABEL=docker-mailserver \
-    LABEL_SHORT=docker-mailserver \
     WAITSTART_TIMEOUT=1m \
     DATABASE_URL="mysql://%env(MYSQL_USER)%:%env(MYSQL_PASSWORD)%@%env(MYSQL_HOST)%:%env(MYSQL_PORT)%/%env(MYSQL_DATABASE)%?serverVersion=8.4" \
     SERVER_ROOT=/var/www/html
@@ -76,7 +74,7 @@ RUN --mount=type=cache,target=/root/.composer \
 
 FROM composer AS admin-builder
 
-ARG ADMIN_VER=5.8.0 # renovate: depName=jeboehm/mailserver-admin
+ARG ADMIN_VER=5.9.0 # renovate: depName=jeboehm/mailserver-admin
 WORKDIR /opt/admin
 RUN curl -sSLf \
         -o /tmp/admin.tar.gz \
@@ -90,22 +88,18 @@ FROM base AS prod
 WORKDIR /
 COPY --chown=root:root --from=roundcube-builder /opt/roundcube/ /opt/roundcube/
 COPY --chown=root:root --from=admin-builder /opt/admin/ /opt/admin/
-# TODO: Remove when autoconfig is served by admin.
-COPY --chown=root:root --from=ghcr.io/jeboehm/dockerize:0.9.3@sha256:d4e824aa120670658d7012421d2fdf1b2437be34a6acbb7a4ad92ed52edec8eb /bin/dockerize /usr/local/bin/dockerize
 COPY --chown=root:root rootfs/ /
 
 RUN ln -s /opt/roundcube/public_html ${SERVER_ROOT}/webmail && \
     ln -s /opt/admin/public ${SERVER_ROOT}/manager
 
 ARG USER=app
-RUN mkdir ${SERVER_ROOT}/autoconfig && \
-    adduser -DH ${USER} && \
+RUN adduser -DH ${USER} && \
 	chown -R ${USER}:${USER} \
         /opt/admin/var/cache/prod \
         /opt/admin/var/log \
         /opt/roundcube/logs \
-        /opt/roundcube/temp \
-        ${SERVER_ROOT}/autoconfig
+        /opt/roundcube/temp
 USER ${USER}
 
 HEALTHCHECK CMD /usr/local/bin/healthcheck.sh

target/web/rootfs/etc/frankenphp/Caddyfile

@@ -12,11 +12,6 @@ http://:8080 {
 	root {$SERVER_ROOT}
 	encode zstd br gzip
 
-	handle_path /.well-known/autoconfig/mail/* {
-		root {$SERVER_ROOT}/autoconfig
-		file_server
-	}
-
 	handle_path /webmail* {
 		root {$SERVER_ROOT}/webmail
 		php_server {

target/web/rootfs/opt/autoconfig/config-v1.1.xml.templ

@@ -2,8 +2,4 @@
 # This script is used to initialize the container.
 set -e
 
-dockerize \
-	-template "/opt/autoconfig/config-v1.1.xml.templ:${SERVER_ROOT}/autoconfig/config-v1.1.xml" \
-	/bin/true
-
 /usr/local/lib/init_database.sh