From 53f754f5ac47cec73c47f676be3ab0aad6ff6471 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sun, 14 Jul 2019 09:33:54 +0000 Subject: [PATCH] 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/