Über Open CoDE Software Wiki Diskussionen GitLab

Skip to content
Snippets Groups Projects
Verified Commit 437a6208 authored by Dominik Kaminski's avatar Dominik Kaminski :fire:
Browse files

feat(Dockerfile): Add KeyFileEd25519 support

parent f72cab0e
No related branches found
No related tags found
No related merge requests found
Pipeline #67312 passed
...@@ -26,9 +26,10 @@ LABEL org.opencontainers.image.authors="Zentrum für Digitale Souveränität der ...@@ -26,9 +26,10 @@ LABEL org.opencontainers.image.authors="Zentrum für Digitale Souveränität der
RUN apk add --no-cache \ RUN apk add --no-cache \
python3=3.12.3-r1 \ python3=3.12.3-r1 \
py3-pip=24.0-r2 \ py3-pip=24.0-r2 \
libmilter \ libmilter=1.0.2-r9 \
envsubst \ gettext-envsubst=0.22.5-r0 \
bash openssl=3.3.1-r3 \
bash=5.2.26-r0
COPY --from=build /usr/bin/arcsign \ COPY --from=build /usr/bin/arcsign \
/usr/bin/arcverify \ /usr/bin/arcverify \
......
...@@ -6,7 +6,6 @@ Syslog no ...@@ -6,7 +6,6 @@ Syslog no
UMask 007 UMask 007
Domain ${DKIMPY_DOMAIN} Domain ${DKIMPY_DOMAIN}
KeyFile /usr/local/etc/mail/dkim.key
Selector ${DKIMPY_SELECTOR} Selector ${DKIMPY_SELECTOR}
Mode ${DKIMPY_MODE:-sv} Mode ${DKIMPY_MODE:-sv}
......
...@@ -3,10 +3,22 @@ ...@@ -3,10 +3,22 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
serviceStart() { serviceStart() {
# Replace environment variables
envsubst < "/etc/dkimpy-milter/dkimpy-milter.conf.template" > "/tmp/dkimpy-milter.conf"
# Start dkimpy # Start dkimpy
/usr/bin/dkimpy-milter /tmp/dkimpy-milter.conf &>> /proc/1/fd/1 /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 serviceStart &>> /proc/1/fd/1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Use of Cookies

We use Matomo Analytics to analyze and evaluate the use of our platform. The insights help us to improve our offerings and make them more relevant for you.

You can choose whether to allow us to process your data for these purposes and set the corresponding cookies. For more information about data protection — especially regarding "Cookies" and "Matomo"— please refer to our Privacy Policy. You can withdraw your consent at any time.