From b2abbc8856ae542d7f52685a274abed1ef4fd4a3 Mon Sep 17 00:00:00 2001 From: Will Date: Wed, 22 Dec 2021 09:19:44 +0000 Subject: [PATCH 1/2] update Dockerfile to alpine 3.14.3 --- 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/fetchmail/Dockerfile | 2 +- optional/radicale/Dockerfile | 2 +- optional/unbound/Dockerfile | 2 +- setup/Dockerfile | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index fde7c877..4267f3b1 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -1,5 +1,5 @@ # First stage to build assets -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.14.3 ARG ARCH="" FROM ${ARCH}node:16 as assets diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index f09866b9..4663d351 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.14.3 FROM $DISTRO ARG VERSION diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 744de810..434f72eb 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.14.3 FROM $DISTRO ARG VERSION diff --git a/core/none/Dockerfile b/core/none/Dockerfile index bae5e8a3..df5833ce 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.14.2 +ARG DISTRO=alpine:3.14.3 FROM $DISTRO CMD sleep 1000000d diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 39ea6eee..f2d03413 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.14.3 FROM $DISTRO ARG VERSION diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index 97a47d30..477cf89d 100644 --- a/optional/clamav/Dockerfile +++ b/optional/clamav/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.14.3 FROM $DISTRO ARG VERSION diff --git a/optional/fetchmail/Dockerfile b/optional/fetchmail/Dockerfile index 81ccc2d1..37379521 100644 --- a/optional/fetchmail/Dockerfile +++ b/optional/fetchmail/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.14.3 FROM $DISTRO ARG VERSION diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile index 93796eb1..10d10ea0 100644 --- a/optional/radicale/Dockerfile +++ b/optional/radicale/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.14.3 FROM $DISTRO ARG VERSION diff --git a/optional/unbound/Dockerfile b/optional/unbound/Dockerfile index 3a86cc6c..21ba9571 100644 --- a/optional/unbound/Dockerfile +++ b/optional/unbound/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.14.3 FROM $DISTRO ARG VERSION diff --git a/setup/Dockerfile b/setup/Dockerfile index baa35da9..cc5f0fd3 100644 --- a/setup/Dockerfile +++ b/setup/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.14.3 FROM $DISTRO ARG VERSION ENV TZ Etc/UTC @@ -21,4 +21,4 @@ COPY static ./static EXPOSE 80/tcp CMD gunicorn -w 4 -b :80 --access-logfile - --error-logfile - --preload main:app -RUN echo $VERSION >> /version \ No newline at end of file +RUN echo $VERSION >> /version From 83bd3b27aac9487ae698960232dff3bfd0f844d0 Mon Sep 17 00:00:00 2001 From: willofr Date: Wed, 22 Dec 2021 11:17:13 +0100 Subject: [PATCH 2/2] Create 2099.bugfix --- towncrier/newsfragments/2099.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 towncrier/newsfragments/2099.bugfix diff --git a/towncrier/newsfragments/2099.bugfix b/towncrier/newsfragments/2099.bugfix new file mode 100644 index 00000000..5c371f0b --- /dev/null +++ b/towncrier/newsfragments/2099.bugfix @@ -0,0 +1 @@ +updated Dockerfile to alpine 3.14.3 to address several CVEs