From 0306be1eed9103df50c0b561e0d3cf842b41e6a6 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 14 Jul 2019 10:27:57 +0000 Subject: [PATCH] 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