diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index 4267f3b1..faa3b125 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -1,5 +1,5 @@ # First stage to build assets -ARG DISTRO=alpine:3.14.3 +ARG DISTRO=alpine:3.14.4 ARG ARCH="" FROM ${ARCH}node:16 as assets @@ -13,7 +13,7 @@ COPY webpack.config.js ./ COPY assets ./assets RUN set -eu \ && sed -i 's/#007bff/#55a5d9/' node_modules/admin-lte/build/scss/_bootstrap-variables.scss \ - && for l in ca da de:de_de en:en-gb es:es_es eu fr:fr_fr he hu is it:it_it ja nb_NO:no_nb nl:nl_nl pl pt:pt_pt ru sv:sv_se zh; do \ + && for l in ca da de:de-DE en:en-GB es:es-ES eu fr:fr-FR he hu is it:it-IT ja nb_NO:no-NB nl:nl-NL pl pt:pt-PT ru sv:sv-SE zh; do \ cp node_modules/datatables.net-plugins/i18n/${l#*:}.json assets/${l%:*}.json; \ done \ && node_modules/.bin/webpack-cli --color @@ -59,4 +59,4 @@ ENV FLASK_APP mailu CMD /start.py HEALTHCHECK CMD curl -f -L http://localhost/sso/login?next=ui.index || exit 1 -RUN echo $VERSION >> /version \ No newline at end of file +RUN echo $VERSION >> /version diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index 4663d351..7ba2baf2 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.3 +ARG DISTRO=alpine:3.14.4 FROM $DISTRO ARG VERSION diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 434f72eb..eb8180f0 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.3 +ARG DISTRO=alpine:3.14.4 FROM $DISTRO ARG VERSION diff --git a/core/none/Dockerfile b/core/none/Dockerfile index df5833ce..c22c3bf6 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.3 +ARG DISTRO=alpine:3.14.4 FROM $DISTRO CMD sleep 1000000d diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 6f2519db..a9b8df1a 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.3 +ARG DISTRO=alpine:3.14.4 FROM $DISTRO ARG VERSION diff --git a/docs/faq.rst b/docs/faq.rst index 9bbd359c..4757e6a1 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -527,7 +527,7 @@ These issues are typically caused by four scenarios: #. Certificates expired; #. When ``TLS_FLAVOR=letsencrypt``, it might be that the *certbot* script is not capable of obtaining the certificates for your domain. See `letsencrypt issues`_ -#. When ``TLS_FLAVOR=certs``, certificates are supposed to be copied to ``/mailu/certs``. +#. When ``TLS_FLAVOR=cert``, certificates are supposed to be copied to ``/mailu/certs``. Using an external ``letsencrypt`` program, it tends to happen people copy the whole ``letsencrypt/live`` directory containing symlinks. Symlinks do not resolve inside the container and therefore it breaks the TLS implementation. diff --git a/docs/reverse.rst b/docs/reverse.rst index 8d0dcc8e..91c6f67e 100644 --- a/docs/reverse.rst +++ b/docs/reverse.rst @@ -189,7 +189,7 @@ Mailu must also be configured with the information what header is used by the re .. code-block:: docker #mailu.env file - REAL_IP_HEADER=X-Real-IP + REAL_IP_HEADER=X-Real-Ip REAL_IP_FROM=x.x.x.x,y.y.y.y.y #x.x.x.x,y.y.y.y.y is the static IP address your reverse proxy uses for connecting to Mailu. diff --git a/docs/rpi_build.rst b/docs/rpi_build.rst index 5796e188..07be77de 100644 --- a/docs/rpi_build.rst +++ b/docs/rpi_build.rst @@ -17,8 +17,8 @@ Adjustments ``build_arm.sh`` uses some variables passed as ``build-arg`` to docker-compose: - ``ALPINE_VER``: version of ALPINE to use -- ``DISTRO``: is the main distro used. Dockerfiles are set on Alpine 3.10, and - build script overrides for ``balenalib/rpi-alpine:3.10`` +- ``DISTRO``: is the main distro used. Dockerfiles are set on Alpine 3.14, and + build script overrides for ``balenalib/rpi-alpine:3.14`` - ``QEMU``: Used by webmails dockerfiles. It will add ``qemu-arm-static`` only if ``QEMU`` is set to ``arm`` - ``ARCH``: Architecture to use for ``admin``, and ``webmails`` as their images diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index 477cf89d..53a4b198 100644 --- a/optional/clamav/Dockerfile +++ b/optional/clamav/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.3 +ARG DISTRO=alpine:3.14.4 FROM $DISTRO ARG VERSION diff --git a/optional/fetchmail/Dockerfile b/optional/fetchmail/Dockerfile index 37379521..fe582088 100644 --- a/optional/fetchmail/Dockerfile +++ b/optional/fetchmail/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.3 +ARG DISTRO=alpine:3.14.4 FROM $DISTRO ARG VERSION diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile index 10d10ea0..b31439ef 100644 --- a/optional/radicale/Dockerfile +++ b/optional/radicale/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.3 +ARG DISTRO=alpine:3.14.4 FROM $DISTRO ARG VERSION diff --git a/optional/unbound/Dockerfile b/optional/unbound/Dockerfile index 21ba9571..5a6bc38a 100644 --- a/optional/unbound/Dockerfile +++ b/optional/unbound/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.3 +ARG DISTRO=alpine:3.14.4 FROM $DISTRO ARG VERSION diff --git a/setup/Dockerfile b/setup/Dockerfile index cc5f0fd3..4a0f355b 100644 --- a/setup/Dockerfile +++ b/setup/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.3 +ARG DISTRO=alpine:3.14.4 FROM $DISTRO ARG VERSION ENV TZ Etc/UTC diff --git a/towncrier/newsfragments/2281.bugfix b/towncrier/newsfragments/2281.bugfix new file mode 100644 index 00000000..5163805b --- /dev/null +++ b/towncrier/newsfragments/2281.bugfix @@ -0,0 +1 @@ +Update to Alpine Linux 3.14.4 which contains a security fix for openssl.