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] 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 \