From cff2e762696d1903d6ac0de3890cdacfed00e874 Mon Sep 17 00:00:00 2001 From: ofthesun9 Date: Mon, 15 Jun 2020 17:32:56 +0200 Subject: [PATCH] Switching to alpine:3.12 --- core/admin/Dockerfile | 4 ++-- core/dovecot/Dockerfile | 2 +- core/nginx/Dockerfile | 2 +- core/none/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- core/rspamd/Dockerfile | 2 +- optional/clamav/Dockerfile | 2 +- optional/postgresql/Dockerfile | 4 ++-- optional/radicale/Dockerfile | 2 +- optional/unbound/Dockerfile | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index 485ad261..f3b8643c 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -1,5 +1,5 @@ # First stage to build assets -ARG DISTRO=alpine:3.10 +ARG DISTRO=alpine:3.12 ARG ARCH="" FROM ${ARCH}node:8 as assets COPY --from=balenalib/rpi-alpine:3.10 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static @@ -43,4 +43,4 @@ ENV FLASK_APP mailu CMD /start.py -HEALTHCHECK CMD curl -f -L http://localhost/ui/login?next=ui.index || exit 1 \ No newline at end of file +HEALTHCHECK CMD curl -f -L http://localhost/ui/login?next=ui.index || exit 1 diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index da75140c..f6f8f2e2 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.10 +ARG DISTRO=alpine:3.12 FROM $DISTRO as builder WORKDIR /tmp RUN apk add git build-base automake autoconf libtool dovecot-dev xapian-core-dev icu-dev diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 8189ad9f..2bc1cfd1 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.10 +ARG DISTRO=alpine:3.12 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ diff --git a/core/none/Dockerfile b/core/none/Dockerfile index b80a2d10..70041dac 100644 --- a/core/none/Dockerfile +++ b/core/none/Dockerfile @@ -1,6 +1,6 @@ # This is an idle image to dynamically replace any component if disabled. -ARG DISTRO=alpine:3.10 +ARG DISTRO=alpine:3.12 FROM $DISTRO CMD sleep 1000000d diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 187b30f1..8652eaa0 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.10 +ARG DISTRO=alpine:3.12 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ diff --git a/core/rspamd/Dockerfile b/core/rspamd/Dockerfile index ba86e51e..acaf074e 100644 --- a/core/rspamd/Dockerfile +++ b/core/rspamd/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.10 +ARG DISTRO=alpine:3.12 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index af96e65f..1132845f 100644 --- a/optional/clamav/Dockerfile +++ b/optional/clamav/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.11 +ARG DISTRO=alpine:3.12 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile index fbcad249..95048147 100644 --- a/optional/postgresql/Dockerfile +++ b/optional/postgresql/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.10 +ARG DISTRO=alpine:3.12 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ @@ -6,7 +6,7 @@ RUN apk add --no-cache \ && pip3 install --upgrade pip # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube -RUN pip3 install socrate +RUN pip3 install socrate==0.2.0 # Image specific layers under this line RUN apk add --no-cache \ diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile index 64712208..514072ce 100644 --- a/optional/radicale/Dockerfile +++ b/optional/radicale/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.10 +ARG DISTRO=alpine:3.12 FROM $DISTRO RUN apk add --no-cache curl bash python3 \ diff --git a/optional/unbound/Dockerfile b/optional/unbound/Dockerfile index 71d13925..abb45420 100644 --- a/optional/unbound/Dockerfile +++ b/optional/unbound/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.10 +ARG DISTRO=alpine:3.12 FROM $DISTRO # python3 shared with most images RUN apk add --no-cache \ @@ -6,7 +6,7 @@ RUN apk add --no-cache \ && pip3 install --upgrade pip # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube -RUN pip3 install socrate +RUN pip3 install socrate==0.2.0 # Image specific layers under this line RUN apk add --no-cache unbound curl bind-tools \