diff --git a/Dockerfile b/Dockerfile index 3a0a053..ae72b07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,10 @@ LABEL maintainer="source@kingsquare.nl" RUN set -ex; \ \ - DEBIAN_FRONTEND=noninteractive apt -yq update && \ - DEBIAN_FRONTEND=noninteractive apt -yq install \ + #https://github.com/hackafake/hackafake-backend/issues/32#issuecomment-735602580 + #https://exerror.com/repository-http-deb-debian-org-debian-buster-updates-inrelease-changed-its-suite-value-from-stable-updates-to-oldstable-updates/ + DEBIAN_FRONTEND=noninteractive apt-get -yq --allow-releaseinfo-change update && \ + DEBIAN_FRONTEND=noninteractive apt-get -yq install \ supervisor \ ca-certificates \ openssl \ @@ -19,8 +21,8 @@ RUN set -ex; \ pfqueue \ procps \ && \ - apt -yq autoremove && \ - apt -yq clean && \ + apt-get -yq autoremove && \ + apt-get -yq clean && \ rm -rf /var/log/{apt/*,dpkg.log,alternatives.log} && \ rm -rf /var/log/apt/* && \ rm -rf /var/apt/lists/* && \ diff --git a/README.md b/README.md index d429ed8..575e5f5 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Build local image from repo -p 587:587 \ -e maildomain=mail.example.com \ -e smtp_user=user:pwd \ - -e dkimselector=mail \ + -e dkimselector=default \ -v /path/to/domainkeys:/etc/opendkim/domainkeys \ --name postfix \ -d kingsquare/postfix @@ -74,7 +74,7 @@ Build local image from repo -p 587:587 \ -e maildomain=mail.example.com \ -e smtp_user=user:pwd \ - -e dkimselector=mail \ + -e dkimselector=default \ -v /path/to/etc/opendkim:/etc/opendkim \ --name postfix \ -d kingsquare/postfix diff --git a/src/bin/setup-opendkim.sh b/src/bin/setup-opendkim.sh index fd81593..e5662fb 100755 --- a/src/bin/setup-opendkim.sh +++ b/src/bin/setup-opendkim.sh @@ -27,7 +27,7 @@ Canonicalization relaxed/simple ExternalIgnoreList refile:/etc/opendkim/TrustedHosts InternalHosts refile:/etc/opendkim/TrustedHosts -KeyTable refile:/etc/opendkim/KeyTable +KeyTable /etc/opendkim/KeyTable SigningTable refile:/etc/opendkim/SigningTable Mode sv @@ -62,7 +62,7 @@ $maildomain *.$maildomain EOF cat >>/etc/opendkim/KeyTable <>/etc/opendkim/SigningTable <