From ef3c6c407a4b53375ab4dde70dee209da1d0637e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20S=C3=A4nger?= Date: Mon, 3 Jun 2019 00:55:09 +0200 Subject: [PATCH 01/24] upgrade alpine base-image --- core/admin/Dockerfile | 7 ++++--- core/dovecot/Dockerfile | 9 +++++---- core/nginx/Dockerfile | 4 ++-- core/none/Dockerfile | 2 +- core/postfix/Dockerfile | 9 +++++---- optional/clamav/Dockerfile | 2 +- services/fetchmail/Dockerfile | 4 ++-- services/rspamd/Dockerfile | 4 ++-- services/unbound/Dockerfile | 4 ++-- 9 files changed, 24 insertions(+), 21 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index 40f9ff59..c9adf862 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -1,17 +1,18 @@ -FROM alpine:3.8 +FROM alpine:3.9 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip +# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart # Image specific layers under this line RUN mkdir -p /app WORKDIR /app COPY requirements-prod.txt requirements.txt -RUN apk add --no-cache libressl curl postgresql-libs mariadb-connector-c \ +RUN apk add --no-cache openssl curl postgresql-libs mariadb-connector-c \ && apk add --no-cache --virtual build-dep \ - libressl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev \ + openssl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev \ && pip3 install -r requirements.txt \ && apk del --no-cache build-dep diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index 94432564..eddc32cd 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,14 +1,15 @@ -FROM alpine:3.8 +FROM alpine:3.9 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart +# Shared layer between dovecot and postfix +RUN pip3 install podop # Image specific layers under this line RUN apk add --no-cache \ - dovecot dovecot-pigeonhole-plugin rspamd-client bash \ - && pip3 install podop \ + dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client \ && mkdir /var/lib/dovecot COPY conf /conf diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 0156cccf..3534036d 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:3.8 +FROM alpine:3.9 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache certbot nginx nginx-mod-mail openssl curl \ diff --git a/core/none/Dockerfile b/core/none/Dockerfile index f96ec394..295863cf 100644 --- a/core/none/Dockerfile +++ b/core/none/Dockerfile @@ -1,5 +1,5 @@ # This is an idle image to dynamically replace any component if disabled. -FROM alpine:3.8 +FROM alpine:3.9 CMD sleep 1000000d diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 3eff5218..661032cc 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -1,14 +1,15 @@ -FROM alpine:3.8 +FROM alpine:3.9 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart +# Shared layer between dovecot and postfix +RUN pip3 install podop # Image specific layers under this line -RUN apk add --no-cache postfix postfix-pcre rsyslog \ - && pip3 install podop +RUN apk add --no-cache postfix postfix-pcre rsyslog COPY conf /conf COPY start.py /start.py diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index 27254544..459bd033 100644 --- a/optional/clamav/Dockerfile +++ b/optional/clamav/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.9 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip bash \ diff --git a/services/fetchmail/Dockerfile b/services/fetchmail/Dockerfile index 4004706d..8b4f759c 100644 --- a/services/fetchmail/Dockerfile +++ b/services/fetchmail/Dockerfile @@ -1,5 +1,5 @@ # First stage: Build -FROM alpine:3.8 as builder +FROM alpine:3.10 as builder # build dependencies RUN apk add --no-cache curl tar xz autoconf git gettext build-base openssl openssl-dev @@ -9,7 +9,7 @@ RUN cd fetchmail-7.0.0-alpha6 && \ ./configure --with-ssl --prefix /usr/local --disable-nls && \ make -FROM alpine:3.8 +FROM alpine:3.10 # python3 shared with most images diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index 70e6286d..87d6b394 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:3.8 +FROM alpine:3.9 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache rspamd rspamd-controller rspamd-proxy rspamd-fuzzy ca-certificates curl diff --git a/services/unbound/Dockerfile b/services/unbound/Dockerfile index 325584fd..05ebb2db 100644 --- a/services/unbound/Dockerfile +++ b/services/unbound/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:3.8 +FROM alpine:3.9 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache unbound curl bind-tools \ From 96fbaecc2fcbb884b56a8b7f62b87ec10411f81a Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 23 Jun 2019 19:00:01 +0000 Subject: [PATCH 02/24] Correct executables moved by alpine --- core/postfix/start.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/postfix/start.py b/core/postfix/start.py index 95c97fde..a5a6db06 100755 --- a/core/postfix/start.py +++ b/core/postfix/start.py @@ -54,6 +54,6 @@ convert("/conf/rsyslog.conf", "/etc/rsyslog.conf") multiprocessing.Process(target=start_podop).start() if os.path.exists("/var/run/rsyslogd.pid"): os.remove("/var/run/rsyslogd.pid") -os.system("/usr/lib/postfix/post-install meta_directory=/etc/postfix create-missing") -os.system("/usr/lib/postfix/master &") +os.system("/usr/libexec/postfix/post-install meta_directory=/etc/postfix create-missing") +os.system("/usr/libexec/postfix/master &") os.execv("/usr/sbin/rsyslogd", ["rsyslogd", "-n"]) From d1f80cca9938f2e1a770076211bb1ad51c91f01b Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 23 Jun 2019 19:01:29 +0000 Subject: [PATCH 03/24] Update Dockerfiles to most recent alpine 3.10 --- core/admin/Dockerfile | 2 +- core/dovecot/Dockerfile | 2 +- core/nginx/Dockerfile | 2 +- core/none/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- optional/clamav/Dockerfile | 2 +- optional/postgresql/Dockerfile | 2 +- services/rspamd/Dockerfile | 2 +- services/unbound/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index c9adf862..d4e938d7 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index eddc32cd..1489a724 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 3534036d..a0b9d72a 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/core/none/Dockerfile b/core/none/Dockerfile index 295863cf..96bf8411 100644 --- a/core/none/Dockerfile +++ b/core/none/Dockerfile @@ -1,5 +1,5 @@ # This is an idle image to dynamically replace any component if disabled. -FROM alpine:3.9 +FROM alpine:3.10 CMD sleep 1000000d diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 661032cc..7ef107db 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index 459bd033..02d0279a 100644 --- a/optional/clamav/Dockerfile +++ b/optional/clamav/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip bash \ diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile index b03ff2d1..4a2ccaf4 100644 --- a/optional/postgresql/Dockerfile +++ b/optional/postgresql/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip bash \ diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index 87d6b394..ccb16c8c 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/services/unbound/Dockerfile b/services/unbound/Dockerfile index 05ebb2db..958b2254 100644 --- a/services/unbound/Dockerfile +++ b/services/unbound/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ From f85b32914c57bf46ac59e267fe3dc9d5600fd839 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 23 Jun 2019 19:02:01 +0000 Subject: [PATCH 04/24] Add newly missing plain SASL support in postfix --- core/postfix/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 7ef107db..074cf6a1 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -9,7 +9,7 @@ RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart RUN pip3 install podop # Image specific layers under this line -RUN apk add --no-cache postfix postfix-pcre rsyslog +RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain rsyslog COPY conf /conf COPY start.py /start.py From 9c1675e9d8447791f90f7632ce04a4c46838ca0a Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 23 Jun 2019 19:02:20 +0000 Subject: [PATCH 05/24] Use TEMPORARY workaround-branch for podop python 3.7 compatability --- core/dovecot/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index 1489a724..ec5a8467 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache \ # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix -RUN pip3 install podop +RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37 # Image specific layers under this line RUN apk add --no-cache \ dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client \ diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 074cf6a1..50be8d5c 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache \ # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix -RUN pip3 install podop +RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37 # Image specific layers under this line RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain rsyslog From d155b2c533a9a9e5b530eeda8c730953e1aa05e1 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 23 Jun 2019 19:18:39 +0000 Subject: [PATCH 06/24] Start postfix directly with stdout logging --- core/postfix/Dockerfile | 2 +- core/postfix/conf/main.cf | 3 +++ core/postfix/conf/master.cf | 2 ++ core/postfix/conf/rsyslog.conf | 4 ---- core/postfix/start.py | 5 +---- 5 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 core/postfix/conf/rsyslog.conf diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 50be8d5c..57ac7210 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -9,7 +9,7 @@ RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37 # Image specific layers under this line -RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain rsyslog +RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain COPY conf /conf COPY start.py /start.py diff --git a/core/postfix/conf/main.cf b/core/postfix/conf/main.cf index 7fb32b67..5ad39a3c 100644 --- a/core/postfix/conf/main.cf +++ b/core/postfix/conf/main.cf @@ -2,6 +2,9 @@ # General ############### +# Logging configuration +maillog_file = /dev/stdout + # Main domain and hostname mydomain = {{ DOMAIN }} myhostname = {{ HOSTNAMES.split(",")[0] }} diff --git a/core/postfix/conf/master.cf b/core/postfix/conf/master.cf index 04df550c..b43095ee 100644 --- a/core/postfix/conf/master.cf +++ b/core/postfix/conf/master.cf @@ -33,3 +33,5 @@ discard unix - - n - - discard lmtp unix - - n - - lmtp anvil unix - - n - 1 anvil scache unix - - n - 1 scache +postlog unix-dgram n - n - 1 postlogd + diff --git a/core/postfix/conf/rsyslog.conf b/core/postfix/conf/rsyslog.conf deleted file mode 100644 index 13353b80..00000000 --- a/core/postfix/conf/rsyslog.conf +++ /dev/null @@ -1,4 +0,0 @@ -$ModLoad imuxsock -$template noTimestampFormat,"%syslogtag%%msg%\n" -$ActionFileDefaultTemplate noTimestampFormat -*.*;auth,authpriv.none /dev/stdout diff --git a/core/postfix/start.py b/core/postfix/start.py index a5a6db06..407ddd83 100755 --- a/core/postfix/start.py +++ b/core/postfix/start.py @@ -48,12 +48,9 @@ for map_file in glob.glob("/overrides/*.map"): os.system("postmap {}".format(destination)) os.remove(destination) -convert("/conf/rsyslog.conf", "/etc/rsyslog.conf") - # Run Podop and Postfix multiprocessing.Process(target=start_podop).start() if os.path.exists("/var/run/rsyslogd.pid"): os.remove("/var/run/rsyslogd.pid") os.system("/usr/libexec/postfix/post-install meta_directory=/etc/postfix create-missing") -os.system("/usr/libexec/postfix/master &") -os.execv("/usr/sbin/rsyslogd", ["rsyslogd", "-n"]) +os.system("postfix start-fg") From f97b3fc82726357682387e450129dda5a1e90beb Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 23 Jun 2019 19:25:29 +0000 Subject: [PATCH 07/24] Add towncrier newsfragments --- towncrier/newsfragments/1049.feature | 1 + towncrier/newsfragments/1051.feature | 1 + 2 files changed, 2 insertions(+) create mode 100644 towncrier/newsfragments/1049.feature create mode 100644 towncrier/newsfragments/1051.feature diff --git a/towncrier/newsfragments/1049.feature b/towncrier/newsfragments/1049.feature new file mode 100644 index 00000000..2f7a5a07 --- /dev/null +++ b/towncrier/newsfragments/1049.feature @@ -0,0 +1 @@ +Don’t use complicated rsyslogd logging in postfix anymore, instead start the daemon directly — configured to log to stdout. diff --git a/towncrier/newsfragments/1051.feature b/towncrier/newsfragments/1051.feature new file mode 100644 index 00000000..812bef2f --- /dev/null +++ b/towncrier/newsfragments/1051.feature @@ -0,0 +1 @@ +Update alpine to 3.10 and clean up the ensuing problems. From 09784afcc39c5978b7722cc3601346f4e2e95101 Mon Sep 17 00:00:00 2001 From: Reto Glauser Date: Mon, 24 Jun 2019 06:51:33 +0200 Subject: [PATCH 08/24] update to php 7.3 --- webmails/rainloop/Dockerfile | 2 +- webmails/roundcube/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webmails/rainloop/Dockerfile b/webmails/rainloop/Dockerfile index 975227b0..fb7563cc 100644 --- a/webmails/rainloop/Dockerfile +++ b/webmails/rainloop/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-apache +FROM php:7.3-apache #Shared layer between rainloop and roundcube RUN apt-get update && apt-get install -y \ python3 curl python3-pip git \ diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index 3c970ea4..f0f446f2 100644 --- a/webmails/roundcube/Dockerfile +++ b/webmails/roundcube/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-apache +FROM php:7.3-apache #Shared layer between rainloop and roundcube RUN apt-get update && apt-get install -y \ python3 curl python3-pip git \ From a253ca47fe553e74e69c02a063eef717247eb4d5 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Mon, 24 Jun 2019 18:45:47 +0000 Subject: [PATCH 09/24] Use official Mailu/MailuStart --- core/admin/Dockerfile | 2 +- core/dovecot/Dockerfile | 2 +- core/nginx/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- services/rspamd/Dockerfile | 2 +- services/unbound/Dockerfile | 2 +- webmails/rainloop/Dockerfile | 2 +- webmails/roundcube/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index d4e938d7..22bd4466 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx -RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart +RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN mkdir -p /app WORKDIR /app diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index ec5a8467..cf29364d 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx -RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart +RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37 # Image specific layers under this line diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index a0b9d72a..1630d58a 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx -RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart +RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache certbot nginx nginx-mod-mail openssl curl \ && pip3 install idna requests watchdog diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 57ac7210..0c7f769e 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx -RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart +RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37 # Image specific layers under this line diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index ccb16c8c..6587eb51 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx -RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart +RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache rspamd rspamd-controller rspamd-proxy rspamd-fuzzy ca-certificates curl diff --git a/services/unbound/Dockerfile b/services/unbound/Dockerfile index 958b2254..b8e31049 100644 --- a/services/unbound/Dockerfile +++ b/services/unbound/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx -RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart +RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache unbound curl bind-tools \ && curl -o /etc/unbound/root.hints https://www.internic.net/domain/named.cache \ diff --git a/webmails/rainloop/Dockerfile b/webmails/rainloop/Dockerfile index fb7563cc..978c0410 100644 --- a/webmails/rainloop/Dockerfile +++ b/webmails/rainloop/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \ && apt-get purge -y unzip \ && rm -rf /var/lib/apt/lists - RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart + RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart COPY include.php /var/www/html/include.php COPY php.ini /php.ini diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index f0f446f2..183826ec 100644 --- a/webmails/roundcube/Dockerfile +++ b/webmails/roundcube/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y \ && chown -R www-data: logs temp \ && rm -rf /var/lib/apt/lists - RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart + RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart COPY php.ini /php.ini COPY config.inc.php /var/www/html/config/ From 0144bb5974f5e01e3bb733bcc6b2ff8ce9c1d02b Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Mon, 24 Jun 2019 19:18:18 +0000 Subject: [PATCH 10/24] Add missing libzip dependency for new php modules in roundcube --- webmails/roundcube/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index 183826ec..e2bd27e5 100644 --- a/webmails/roundcube/Dockerfile +++ b/webmails/roundcube/Dockerfile @@ -8,7 +8,8 @@ RUN apt-get update && apt-get install -y \ ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.3.9/roundcubemail-1.3.9-complete.tar.gz RUN apt-get update && apt-get install -y \ - zlib1g-dev python3-jinja2 \ + zlib1g-dev libzip4 libzip-dev \ + python3-jinja2 \ && docker-php-ext-install zip \ && echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini \ && rm -rf /var/www/html/ \ From 80c4edb144a216d5b134133fd19f414b1afb0d15 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Tue, 25 Jun 2019 19:53:50 +0000 Subject: [PATCH 11/24] Add simple patch to build fetchmail against newer libssl --- services/fetchmail/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/services/fetchmail/Dockerfile b/services/fetchmail/Dockerfile index 8b4f759c..d68bcb14 100644 --- a/services/fetchmail/Dockerfile +++ b/services/fetchmail/Dockerfile @@ -6,6 +6,7 @@ RUN apk add --no-cache curl tar xz autoconf git gettext build-base openssl opens RUN curl -L 'https://sourceforge.net/projects/fetchmail/files/branch_7-alpha/fetchmail-7.0.0-alpha6.tar.xz/download' | tar xJ RUN cd fetchmail-7.0.0-alpha6 && \ + sed -i -e 's/SSLv3_client_method/SSLv23_client_method/' socket.c && \ ./configure --with-ssl --prefix /usr/local --disable-nls && \ make From 3bfdff155cee0aba0151f0f9a404356839c59863 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Tue, 25 Jun 2019 19:54:05 +0000 Subject: [PATCH 12/24] Use official Mailu/Podop --- core/dovecot/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index cf29364d..a4a4c3a3 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache \ # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix -RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37 +RUN pip3 install git+https://github.com/Mailu/Podop.git # Image specific layers under this line RUN apk add --no-cache \ dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client \ diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 0c7f769e..c298efa2 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache \ # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix -RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37 +RUN pip3 install git+https://github.com/Mailu/Podop.git # Image specific layers under this line RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain From ea851e77d44363453c9d200d83ac283093121313 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Tue, 25 Jun 2019 20:15:11 +0000 Subject: [PATCH 13/24] Remove reference to rsyslogd --- core/postfix/start.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/postfix/start.py b/core/postfix/start.py index 407ddd83..4dcd90ca 100755 --- a/core/postfix/start.py +++ b/core/postfix/start.py @@ -50,7 +50,5 @@ for map_file in glob.glob("/overrides/*.map"): # Run Podop and Postfix multiprocessing.Process(target=start_podop).start() -if os.path.exists("/var/run/rsyslogd.pid"): - os.remove("/var/run/rsyslogd.pid") os.system("/usr/libexec/postfix/post-install meta_directory=/etc/postfix create-missing") os.system("postfix start-fg") From 1fa287a6d92f2639c3e7ccb16f23d4e884070856 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Tue, 25 Jun 2019 20:33:27 +0000 Subject: [PATCH 14/24] Update radicale dockerfile to alpine 3.10 --- optional/radicale/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile index de63daec..66c1d5ca 100644 --- a/optional/radicale/Dockerfile +++ b/optional/radicale/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:edge +FROM alpine:3.10 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && apk add --no-cache radicale@testing py-dulwich@testing curl bash + && apk add --no-cache radicale@testing curl bash COPY radicale.conf /radicale.conf From c787e4bdbdcf26097892fc8f154dacb19dbb3d49 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Wed, 26 Jun 2019 21:10:50 +0000 Subject: [PATCH 15/24] Move alpine version definition out to variable --- .travis.yml | 3 ++- core/admin/Dockerfile | 3 ++- core/dovecot/Dockerfile | 3 ++- core/nginx/Dockerfile | 3 ++- core/none/Dockerfile | 3 ++- core/postfix/Dockerfile | 3 ++- docs/contributors/environment.rst | 6 +++--- optional/clamav/Dockerfile | 3 ++- optional/postgresql/Dockerfile | 3 ++- optional/radicale/Dockerfile | 3 ++- services/fetchmail/Dockerfile | 5 +++-- services/rspamd/Dockerfile | 3 ++- services/unbound/Dockerfile | 3 ++- 13 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a26c190..5905eee0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ addons: env: - MAILU_VERSION=${TRAVIS_BRANCH////-} + - ALPINE_VERSION=3.10 language: python python: @@ -26,7 +27,7 @@ install: before_script: - docker-compose -v - - docker-compose -f tests/build.yml build + - docker-compose -f tests/build.yml build --build-arg ALPINE_VERSION=${ALPINE_VERSION} - sudo -- sh -c 'mkdir -p /mailu && cp -r tests/certs /mailu && chmod 600 /mailu/certs/*' diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index 22bd4466..7252aeb0 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index a4a4c3a3..f36d1951 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 1630d58a..3c6115ce 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/core/none/Dockerfile b/core/none/Dockerfile index 96bf8411..b383115a 100644 --- a/core/none/Dockerfile +++ b/core/none/Dockerfile @@ -1,5 +1,6 @@ # This is an idle image to dynamically replace any component if disabled. -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION CMD sleep 1000000d diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index c298efa2..dfedb818 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/docs/contributors/environment.rst b/docs/contributors/environment.rst index 161619f6..b326c79c 100644 --- a/docs/contributors/environment.rst +++ b/docs/contributors/environment.rst @@ -112,7 +112,7 @@ After cloning the git repository to your workstation, you can build the images: .. code-block:: bash cd Mailu - docker-compose -f tests/build.yml build + docker-compose -f tests/build.yml build --build-arg ALPINE_VERSION=3.10 The ``build.yml`` file has two variables: @@ -125,7 +125,7 @@ To re-build only specific containers at a later time. .. code-block:: bash - docker-compose -f tests/build.yml build admin webdav + docker-compose -f tests/build.yml --build-arg ALPINE_VERSION=3.10 build admin webdav If you have to push the images to Docker Hub for testing in Docker Swarm or a remote host, you have to define ``DOCKER_ORG`` (usually your Docker user-name) and login to @@ -138,7 +138,7 @@ the hub. Password: Bar export DOCKER_ORG="Foo" export VERSION="feat-extra-app" - docker-compose -f tests/build.yml build + docker-compose -f tests/build.yml build --build-arg ALPINE_VERSION=3.10 docker-compose -f tests/build.yml push Running containers diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index 02d0279a..6375e317 100644 --- a/optional/clamav/Dockerfile +++ b/optional/clamav/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip bash \ diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile index 4a2ccaf4..3edf45d0 100644 --- a/optional/postgresql/Dockerfile +++ b/optional/postgresql/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip bash \ diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile index 66c1d5ca..98b90746 100644 --- a/optional/radicale/Dockerfile +++ b/optional/radicale/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && apk add --no-cache radicale@testing curl bash diff --git a/services/fetchmail/Dockerfile b/services/fetchmail/Dockerfile index d68bcb14..62a826de 100644 --- a/services/fetchmail/Dockerfile +++ b/services/fetchmail/Dockerfile @@ -1,5 +1,6 @@ # First stage: Build -FROM alpine:3.10 as builder +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION as builder # build dependencies RUN apk add --no-cache curl tar xz autoconf git gettext build-base openssl openssl-dev @@ -10,7 +11,7 @@ RUN cd fetchmail-7.0.0-alpha6 && \ ./configure --with-ssl --prefix /usr/local --disable-nls && \ make -FROM alpine:3.10 +FROM alpine:$ALPINE_VERSION # python3 shared with most images diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index 6587eb51..d1a85a28 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/services/unbound/Dockerfile b/services/unbound/Dockerfile index b8e31049..4e92e7e1 100644 --- a/services/unbound/Dockerfile +++ b/services/unbound/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.10 +ARG ALPINE_VERSION +FROM alpine:$ALPINE_VERSION # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ From 466595998bbd4690972ffbacd3ffb43057537ddb Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 30 Jun 2019 11:07:11 +0000 Subject: [PATCH 16/24] Add ALPINE VERSION to deployment build too --- tests/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/deploy.sh b/tests/deploy.sh index 21aec444..a98ff9f9 100755 --- a/tests/deploy.sh +++ b/tests/deploy.sh @@ -9,7 +9,7 @@ if [ "$TRAVIS_BRANCH" = "testing" ]; then # Commit message is like "Try #99". # This sets the version tag to "pr-99" export MAILU_VERSION="pr-${TRAVIS_COMMIT_MESSAGE//[!0-9]/}" - docker-compose -f tests/build.yml build + docker-compose -f tests/build.yml build --build-arg --build-arg ALPINE_VERSION=${ALPINE_VERSION} fi docker login -u $DOCKER_UN -p $DOCKER_PW From bb2edb6eb6ecb0c0d13f94f3ebd550abf6e7b79f Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 30 Jun 2019 11:39:48 +0000 Subject: [PATCH 17/24] Revert "Move alpine version definition out to variable" This reverts commit c787e4bdbdcf26097892fc8f154dacb19dbb3d49. --- .travis.yml | 3 +-- core/admin/Dockerfile | 3 +-- core/dovecot/Dockerfile | 3 +-- core/nginx/Dockerfile | 3 +-- core/none/Dockerfile | 3 +-- core/postfix/Dockerfile | 3 +-- docs/contributors/environment.rst | 6 +++--- optional/clamav/Dockerfile | 3 +-- optional/postgresql/Dockerfile | 3 +-- optional/radicale/Dockerfile | 3 +-- services/fetchmail/Dockerfile | 5 ++--- services/rspamd/Dockerfile | 3 +-- services/unbound/Dockerfile | 3 +-- 13 files changed, 16 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5905eee0..0a26c190 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ addons: env: - MAILU_VERSION=${TRAVIS_BRANCH////-} - - ALPINE_VERSION=3.10 language: python python: @@ -27,7 +26,7 @@ install: before_script: - docker-compose -v - - docker-compose -f tests/build.yml build --build-arg ALPINE_VERSION=${ALPINE_VERSION} + - docker-compose -f tests/build.yml build - sudo -- sh -c 'mkdir -p /mailu && cp -r tests/certs /mailu && chmod 600 /mailu/certs/*' diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index 7252aeb0..22bd4466 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index f36d1951..a4a4c3a3 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 3c6115ce..1630d58a 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/core/none/Dockerfile b/core/none/Dockerfile index b383115a..96bf8411 100644 --- a/core/none/Dockerfile +++ b/core/none/Dockerfile @@ -1,6 +1,5 @@ # This is an idle image to dynamically replace any component if disabled. -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 CMD sleep 1000000d diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index dfedb818..c298efa2 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/docs/contributors/environment.rst b/docs/contributors/environment.rst index b326c79c..161619f6 100644 --- a/docs/contributors/environment.rst +++ b/docs/contributors/environment.rst @@ -112,7 +112,7 @@ After cloning the git repository to your workstation, you can build the images: .. code-block:: bash cd Mailu - docker-compose -f tests/build.yml build --build-arg ALPINE_VERSION=3.10 + docker-compose -f tests/build.yml build The ``build.yml`` file has two variables: @@ -125,7 +125,7 @@ To re-build only specific containers at a later time. .. code-block:: bash - docker-compose -f tests/build.yml --build-arg ALPINE_VERSION=3.10 build admin webdav + docker-compose -f tests/build.yml build admin webdav If you have to push the images to Docker Hub for testing in Docker Swarm or a remote host, you have to define ``DOCKER_ORG`` (usually your Docker user-name) and login to @@ -138,7 +138,7 @@ the hub. Password: Bar export DOCKER_ORG="Foo" export VERSION="feat-extra-app" - docker-compose -f tests/build.yml build --build-arg ALPINE_VERSION=3.10 + docker-compose -f tests/build.yml build docker-compose -f tests/build.yml push Running containers diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index 6375e317..02d0279a 100644 --- a/optional/clamav/Dockerfile +++ b/optional/clamav/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip bash \ diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile index 3edf45d0..4a2ccaf4 100644 --- a/optional/postgresql/Dockerfile +++ b/optional/postgresql/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip bash \ diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile index 98b90746..66c1d5ca 100644 --- a/optional/radicale/Dockerfile +++ b/optional/radicale/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && apk add --no-cache radicale@testing curl bash diff --git a/services/fetchmail/Dockerfile b/services/fetchmail/Dockerfile index 62a826de..d68bcb14 100644 --- a/services/fetchmail/Dockerfile +++ b/services/fetchmail/Dockerfile @@ -1,6 +1,5 @@ # First stage: Build -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION as builder +FROM alpine:3.10 as builder # build dependencies RUN apk add --no-cache curl tar xz autoconf git gettext build-base openssl openssl-dev @@ -11,7 +10,7 @@ RUN cd fetchmail-7.0.0-alpha6 && \ ./configure --with-ssl --prefix /usr/local --disable-nls && \ make -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 # python3 shared with most images diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index d1a85a28..6587eb51 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ diff --git a/services/unbound/Dockerfile b/services/unbound/Dockerfile index 4e92e7e1..b8e31049 100644 --- a/services/unbound/Dockerfile +++ b/services/unbound/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION -FROM alpine:$ALPINE_VERSION +FROM alpine:3.10 # python3 shared with most images RUN apk add --no-cache \ python3 py3-pip git bash \ From a1d808683168521e115bee18486a5d23e64db307 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 30 Jun 2019 11:39:56 +0000 Subject: [PATCH 18/24] Revert "Add ALPINE VERSION to deployment build too" This reverts commit 466595998bbd4690972ffbacd3ffb43057537ddb. --- tests/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/deploy.sh b/tests/deploy.sh index a98ff9f9..21aec444 100755 --- a/tests/deploy.sh +++ b/tests/deploy.sh @@ -9,7 +9,7 @@ if [ "$TRAVIS_BRANCH" = "testing" ]; then # Commit message is like "Try #99". # This sets the version tag to "pr-99" export MAILU_VERSION="pr-${TRAVIS_COMMIT_MESSAGE//[!0-9]/}" - docker-compose -f tests/build.yml build --build-arg --build-arg ALPINE_VERSION=${ALPINE_VERSION} + docker-compose -f tests/build.yml build fi docker login -u $DOCKER_UN -p $DOCKER_PW From 93b54dcffeedf503506a230618b43b9aa2181b72 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 14 Jul 2019 09:24:59 +0000 Subject: [PATCH 19/24] Install podop from pypi --- core/dovecot/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index a4a4c3a3..6b0490b9 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache \ # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix -RUN pip3 install git+https://github.com/Mailu/Podop.git +RUN pip3 install "podop>=0.2.5" # Image specific layers under this line RUN apk add --no-cache \ dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client \ diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index c298efa2..a6a4cf01 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache \ # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix -RUN pip3 install git+https://github.com/Mailu/Podop.git +RUN pip3 install "podop>=0.2.5" # Image specific layers under this line RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain From 53f754f5ac47cec73c47f676be3ab0aad6ff6471 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 14 Jul 2019 09:33:54 +0000 Subject: [PATCH 20/24] Remove MailuStart from admin and correct layer-sharing comments --- core/admin/Dockerfile | 2 -- core/dovecot/Dockerfile | 2 +- core/nginx/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- optional/postgresql/Dockerfile | 2 +- services/rspamd/Dockerfile | 2 +- services/unbound/Dockerfile | 2 +- webmails/rainloop/Dockerfile | 5 +++-- webmails/roundcube/Dockerfile | 3 ++- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index 22bd4466..c9fea4a6 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -3,8 +3,6 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx -RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN mkdir -p /app WORKDIR /app diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index 6b0490b9..af853e81 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix RUN pip3 install "podop>=0.2.5" diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 1630d58a..2ecd6db1 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache certbot nginx nginx-mod-mail openssl curl \ diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index a6a4cf01..d23e4f25 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix RUN pip3 install "podop>=0.2.5" diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile index 4a2ccaf4..552aea48 100644 --- a/optional/postgresql/Dockerfile +++ b/optional/postgresql/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install jinja2 # Image specific layers under this line RUN apk add --no-cache \ diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index 6587eb51..c78de88f 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache rspamd rspamd-controller rspamd-proxy rspamd-fuzzy ca-certificates curl diff --git a/services/unbound/Dockerfile b/services/unbound/Dockerfile index b8e31049..ebfe0185 100644 --- a/services/unbound/Dockerfile +++ b/services/unbound/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache unbound curl bind-tools \ diff --git a/webmails/rainloop/Dockerfile b/webmails/rainloop/Dockerfile index 978c0410..a6a1c739 100644 --- a/webmails/rainloop/Dockerfile +++ b/webmails/rainloop/Dockerfile @@ -21,8 +21,9 @@ RUN apt-get update && apt-get install -y \ && chown -R www-data: * \ && apt-get purge -y unzip \ && rm -rf /var/lib/apt/lists - - RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart + +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart COPY include.php /var/www/html/include.php COPY php.ini /php.ini diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index e2bd27e5..2db49967 100644 --- a/webmails/roundcube/Dockerfile +++ b/webmails/roundcube/Dockerfile @@ -24,7 +24,8 @@ RUN apt-get update && apt-get install -y \ && chown -R www-data: logs temp \ && rm -rf /var/lib/apt/lists - RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart COPY php.ini /php.ini COPY config.inc.php /var/www/html/config/ From 0306be1eed9103df50c0b561e0d3cf842b41e6a6 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 14 Jul 2019 10:27:57 +0000 Subject: [PATCH 21/24] Re-add missing MailuStar in admin It turns out we were all blind and admin *does* use MailuStart --- core/admin/Dockerfile | 2 ++ core/dovecot/Dockerfile | 2 +- core/nginx/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- optional/postgresql/Dockerfile | 2 +- services/rspamd/Dockerfile | 2 +- services/unbound/Dockerfile | 2 +- webmails/rainloop/Dockerfile | 2 +- webmails/roundcube/Dockerfile | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index c9fea4a6..6f26d74c 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -3,6 +3,8 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip +# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN mkdir -p /app WORKDIR /app diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index af853e81..a2c3fffa 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix RUN pip3 install "podop>=0.2.5" diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 2ecd6db1..ecc8beaa 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache certbot nginx nginx-mod-mail openssl curl \ diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index d23e4f25..5bf8122f 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix RUN pip3 install "podop>=0.2.5" diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile index 552aea48..9ad92354 100644 --- a/optional/postgresql/Dockerfile +++ b/optional/postgresql/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install jinja2 # Image specific layers under this line RUN apk add --no-cache \ diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index c78de88f..630f0a0d 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache rspamd rspamd-controller rspamd-proxy rspamd-fuzzy ca-certificates curl diff --git a/services/unbound/Dockerfile b/services/unbound/Dockerfile index ebfe0185..b12ef2b6 100644 --- a/services/unbound/Dockerfile +++ b/services/unbound/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache unbound curl bind-tools \ diff --git a/webmails/rainloop/Dockerfile b/webmails/rainloop/Dockerfile index 94d8eff5..bebe844b 100644 --- a/webmails/rainloop/Dockerfile +++ b/webmails/rainloop/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \ && apt-get purge -y unzip \ && rm -rf /var/lib/apt/lists -# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart COPY include.php /var/www/html/include.php diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index 2db49967..0e6b484f 100644 --- a/webmails/roundcube/Dockerfile +++ b/webmails/roundcube/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y \ && chown -R www-data: logs temp \ && rm -rf /var/lib/apt/lists -# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart COPY php.ini /php.ini From 0f146cd81133a76e517449bfac88b99b3f97678d Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 14 Jul 2019 10:28:56 +0000 Subject: [PATCH 22/24] Require python3.7-compatible podop Which is still unreleased, but serves as a placeholder here. --- core/dovecot/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index a2c3fffa..39f89054 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache \ # Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix -RUN pip3 install "podop>=0.2.5" +RUN pip3 install "podop>0.2.5" # Image specific layers under this line RUN apk add --no-cache \ dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client \ diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 5bf8122f..2f0f168a 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache \ # Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix -RUN pip3 install "podop>=0.2.5" +RUN pip3 install "podop>0.2.5" # Image specific layers under this line RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain From a8c3530bfa31ac545bed49df9919d2fa8dacd7b7 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 14 Jul 2019 13:12:28 +0000 Subject: [PATCH 23/24] Remove accidentally reintroduced rsyslogd config --- core/postfix/start.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/postfix/start.py b/core/postfix/start.py index 79879d01..c1dd6301 100755 --- a/core/postfix/start.py +++ b/core/postfix/start.py @@ -53,8 +53,6 @@ if "RELAYUSER" in os.environ: convert("/conf/sasl_passwd", path) os.system("postmap {}".format(path)) -convert("/conf/rsyslog.conf", "/etc/rsyslog.conf") - # Run Podop and Postfix multiprocessing.Process(target=start_podop).start() os.system("/usr/libexec/postfix/post-install meta_directory=/etc/postfix create-missing") From 1dbda714012f8c971746523875b0ccc661618f73 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 14 Jul 2019 13:12:59 +0000 Subject: [PATCH 24/24] Adapt shared layer conf to now really-missing mailustart in admin (after merging webpack) --- core/dovecot/Dockerfile | 2 +- core/nginx/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- optional/postgresql/Dockerfile | 2 +- services/rspamd/Dockerfile | 2 +- services/unbound/Dockerfile | 2 +- webmails/rainloop/Dockerfile | 2 +- webmails/roundcube/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index 39f89054..f9b0b026 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix RUN pip3 install "podop>0.2.5" diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index ecc8beaa..2ecd6db1 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache certbot nginx nginx-mod-mail openssl curl \ diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 2f0f168a..3b5ba336 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Shared layer between dovecot and postfix RUN pip3 install "podop>0.2.5" diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile index 9ad92354..552aea48 100644 --- a/optional/postgresql/Dockerfile +++ b/optional/postgresql/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install jinja2 # Image specific layers under this line RUN apk add --no-cache \ diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index 630f0a0d..c78de88f 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache rspamd rspamd-controller rspamd-proxy rspamd-fuzzy ca-certificates curl diff --git a/services/unbound/Dockerfile b/services/unbound/Dockerfile index b12ef2b6..ebfe0185 100644 --- a/services/unbound/Dockerfile +++ b/services/unbound/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.10 RUN apk add --no-cache \ python3 py3-pip git bash \ && pip3 install --upgrade pip -# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart # Image specific layers under this line RUN apk add --no-cache unbound curl bind-tools \ diff --git a/webmails/rainloop/Dockerfile b/webmails/rainloop/Dockerfile index bebe844b..94d8eff5 100644 --- a/webmails/rainloop/Dockerfile +++ b/webmails/rainloop/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \ && apt-get purge -y unzip \ && rm -rf /var/lib/apt/lists -# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart COPY include.php /var/www/html/include.php diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index 0e6b484f..2db49967 100644 --- a/webmails/roundcube/Dockerfile +++ b/webmails/roundcube/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y \ && chown -R www-data: logs temp \ && rm -rf /var/lib/apt/lists -# Shared layer between admin, rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx +# Shared layer between rspamd, postfix, dovecot, unbound, rainloop, roundcube and nginx RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart COPY php.ini /php.ini