Merge remote-tracking branch 'upstream/master' into api

4 years ago · 1da7e5b8d2
parent 902b398127 6518ef19af
commit 1da7e5b8d2
2 changed files with 3 additions and 1 deletions
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@ -1,4 +1,4 @@
-ARG DISTRO=alpine:3.12
+ARG DISTRO=alpine:3.13
 FROM $DISTRO as builder
 WORKDIR /tmp
 RUN apk add git build-base automake autoconf libtool dovecot-dev xapian-core-dev icu-dev
--- a/towncrier/newsfragments/1720.bugfix
+++ b/towncrier/newsfragments/1720.bugfix
@ -0,0 +1,2 @@
+Fix CVE-2020-25275 and CVE-2020-24386 by using alpine 3.13 for
+dovecot which contains a fixed dovecot version.