diff --git a/Dockerfile b/Dockerfile index dc5b7ad..0aa7f15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,8 @@ -From lsiobase/alpine:3.13 +From lsiobase/alpine:3.15 ENV \ USE_SASL= \ - # Works around an sasldb bug in Alpine 3.13 \ - USE_SASLAUTHD=yes \ + USE_SASLAUTHD=no \ USE_DKIM= \ USE_TLS= \ MYHOSTNAME= \ diff --git a/Makefile b/Makefile index 201ca7e..1b83009 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ VOLUMES= \ -v ${PWD}/config:/config ENV= \ -e USE_SASL=yes \ - -e USE_SASLAUTHD=yes \ -e USE_TLS=yes \ -e MYHOSTNAME=home.honig.net \ -e MYORIGIN=honig.net \ @@ -23,7 +22,7 @@ run: build docker run ${VOLUMES} ${ENV} ${PORTS} -it ${IMAGE}:${TAG} sasl_users: build - docker run ${VOLUMES} ${ENV} ${PORTS} -it ${IMAGE}:${TAG} sasl_users + docker run ${VOLUMES} ${ENV} ${PORTS} -it ${IMAGE}:${TAG} update_sasldb_users # Run the container with just a bash shell run-bash: build diff --git a/README.md b/README.md index dcf908c..49d4989 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,6 @@ services: + When USE_TLS is enabled, /config/server.cert and /config/server.key should must exist + When using SASL, /config/sasl.users should should have one entry per line of user and password seperated by a space + When using SASL, run *update_sasldb_users when that file is updated -+ When using SASL, a bug in Alpine 3.13 requires USE_SASLAUTHD=yes + Additonal postfix configuration can be stored in /config/postconf as arguments to the postconf command ## TODO