CHANGELOG.md

+# [1.1.0](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images/dkimpy-milter/compare/v1.0.1...v1.1.0) (2024-08-06)
+
+
+### Features
+
+* **Dockerfile:** Add KeyFileEd25519 support ([437a620](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images/dkimpy-milter/commit/437a6208767623131577b450dd2d29952d21674c))
+
 ## [1.0.1](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images/dkimpy-milter/compare/v1.0.0...v1.0.1) (2024-08-06)
 
 

Dockerfile

@@ -26,9 +26,10 @@ LABEL org.opencontainers.image.authors="Zentrum für Digitale Souveränität der
 RUN apk add --no-cache \
     python3=3.12.3-r1 \
     py3-pip=24.0-r2 \
-    libmilter \
-    envsubst \
-    bash
+    libmilter=1.0.2-r9 \
+    gettext-envsubst=0.22.5-r0 \
+    openssl=3.3.1-r3 \
+    bash=5.2.26-r0
 
 COPY --from=build /usr/bin/arcsign \
                   /usr/bin/arcverify \

conf/dkimpy-milter.conf

@@ -6,7 +6,6 @@ Syslog                  no
 UMask                   007
 
 Domain                 ${DKIMPY_DOMAIN}
-KeyFile                /usr/local/etc/mail/dkim.key
 Selector               ${DKIMPY_SELECTOR}
 
 Mode                   ${DKIMPY_MODE:-sv}

conf/entrypoint.sh

@@ -3,10 +3,22 @@
 # SPDX-License-Identifier: Apache-2.0
 
 serviceStart() {
-  # Replace environment variables
-  envsubst < "/etc/dkimpy-milter/dkimpy-milter.conf.template" > "/tmp/dkimpy-milter.conf"
   # Start dkimpy
   /usr/bin/dkimpy-milter /tmp/dkimpy-milter.conf &>> /proc/1/fd/1
 }
 
+# Replace environment variables
+envsubst < "/etc/dkimpy-milter/dkimpy-milter.conf.template" > "/tmp/dkimpy-milter.conf"
+
+# Configure ED25519 key location
+if [ "${DKIMPY_ED25519_ENABLED}" = "yes" ]; then
+cat << EOF >> /tmp/dkimpy-milter.conf
+KeyFileEd25519          /usr/local/etc/mail/dkim_ed25519.key
+EOF
+else
+cat << EOF >> /tmp/dkimpy-milter.conf
+KeyFile                /usr/local/etc/mail/dkim.key
+EOF
+fi
+
 serviceStart &>> /proc/1/fd/1