docker/docker-mail
1
0
Fork 0
Code Issues 4 Pull Requests Actions Projects Releases 6 Wiki Activity

fix(build): fix build logic

Browse Source 
!10
This commit is contained in:
Jon Lockwood
2023-05-21 12:57:03 +09:30
parent 4c106025d5
commit 9a0df52cd9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dockerfile
View File

@ -48,6 +48,8 @@ ARG VERSION_APT_POSTFIX
ARG VERSION_APT_POSTFIX_POLICYD_SPF_PYTHON ARG VERSION_APT_POSTFIX_POLICYD_SPF_PYTHON
ARG VERSION_APT_SPAMASSASSIN ARG VERSION_APT_SPAMASSASSIN
#COPY apt_proxy.conf /etc/apt/apt.conf.d/apt_proxy.conf
LABEL \ LABEL \
#org.opencontainers.image.created="" \ # set during build with $(date --rfc-3339=seconds) \ #org.opencontainers.image.created="" \ # set during build with $(date --rfc-3339=seconds) \
org.opencontainers.image.authors="No Fuss Computing" \ org.opencontainers.image.authors="No Fuss Computing" \
@ -109,11 +111,12 @@ RUN apt update && apt -y --no-install-recommends install \
opendkim=$VERSION_APT_OPENDKIM \ opendkim=$VERSION_APT_OPENDKIM \
opendkim-tools=$VERSION_APT_OPENDKIM \ opendkim-tools=$VERSION_APT_OPENDKIM \
# SPF # SPF
postfix-policyd-spf-python=$VERSION_APT_POSTFIX_POLICYD_SPF_PYTHON \ postfix-policyd-spf-python=$VERSION_APT_POSTFIX_POLICYD_SPF_PYTHON; \
# Dovecot # Dovecot
&& if [ "0$(echo `dpkg --print-architecture`)" == "0amd64" ]; then \ if [ "0$(echo `dpkg --print-architecture`)" = "0amd64" ]; then \
echo "[DEBUG] installing dovecot via APT"; \
curl https://repo.dovecot.org/DOVECOT-REPO-GPG | gpg --import && \ curl https://repo.dovecot.org/DOVECOT-REPO-GPG | gpg --import && \
gpg --export ED409DA1 > /etc/apt/trusted.gpg.d/dovecot.gpg \ gpg --export ED409DA1 > /etc/apt/trusted.gpg.d/dovecot.gpg; \
echo "deb https://repo.dovecot.org/ce-$DOVECOT_BUILD_VERSION/debian/bullseye bullseye main" > /etc/apt/sources.list.d/dovecot.list; \ echo "deb https://repo.dovecot.org/ce-$DOVECOT_BUILD_VERSION/debian/bullseye bullseye main" > /etc/apt/sources.list.d/dovecot.list; \
apt update; \ apt update; \
apt -y --no-install-recommends install \ apt -y --no-install-recommends install \
@ -124,6 +127,7 @@ RUN apt update && apt -y --no-install-recommends install \
dovecot-sieve=$VERSION_APT_DOVECOT \ dovecot-sieve=$VERSION_APT_DOVECOT \
dovecot-managesieved=$VERSION_APT_DOVECOT; \ dovecot-managesieved=$VERSION_APT_DOVECOT; \
else \ else \
echo "[DEBUG] installing dovecot via compiled binaries"; \
# as this architecture doesn't exist in the apt repo, use compiled versions # as this architecture doesn't exist in the apt repo, use compiled versions
adduser --system --group dovecot --no-create-home; \ adduser --system --group dovecot --no-create-home; \
cd tmp; \ cd tmp; \