Unverified Commit 6122f053 authored by bors[bot]'s avatar bors[bot] Committed by GitHub
Browse files

Merge #2308

2308: Update alpine-linux to 3.14.5 - Zlib security FIX (backport #2302) r=mergify[bot] a=mergify[bot]

This is an automatic backport of pull request #2302 done by [Mergify](https://mergify.com).
Cherry-pick of a54a784168c023d1f95c2c1ba0cd97659ffbd08c has failed:
```
On branch mergify/bp/1.9/pr-2302
Your branch is up to date with 'origin/1.9'.

You are currently cherry-picking commit a54a7841.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/admin/Dockerfile
	both modified:   core/dovecot/Dockerfile
	both modified:   core/nginx/Dockerfile
	both modified:   core/none/Dockerfile
	both modified:   core/postfix/Dockerfile
	both modified:   optional/clamav/Dockerfile
	both modified:   optional/fetchmail/Dockerfile
	both modified:   optional/radicale/Dockerfile
	both modified:   optional/unbound/Dockerfile
	both modified:   setup/Dockerfile

no changes added to commit (use "git add" and/or "git commit -a")
```


To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com


</details>


Co-authored-by: default avatarWill <will@packer-output-c8fcfb40-3d93-4475-8f87-e14a9dd683b6>
Co-authored-by: default avatarFlorent Daigniere <nextgens@users.noreply.github.com>
parents 1924c265 50d8778e
# First stage to build assets
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
ARG ARCH=""
FROM ${ARCH}node:16 as assets
......@@ -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
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
......@@ -31,4 +31,4 @@ VOLUME ["/mail"]
CMD /start.py
HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 110|grep "Dovecot ready."
RUN echo $VERSION >> /version
\ No newline at end of file
RUN echo $VERSION >> /version
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
......@@ -31,4 +31,4 @@ VOLUME ["/overrides"]
CMD /start.py
HEALTHCHECK CMD curl -k -f -L http://localhost/health || exit 1
RUN echo $VERSION >> /version
\ No newline at end of file
RUN echo $VERSION >> /version
# This is an idle image to dynamically replace any component if disabled.
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
FROM $DISTRO
CMD sleep 1000000d
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
......@@ -35,4 +35,4 @@ VOLUME ["/queue"]
CMD /start.py
HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 25|grep "220 .* ESMTP Postfix"
RUN echo $VERSION >> /version
\ No newline at end of file
RUN echo $VERSION >> /version
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
......@@ -23,4 +23,4 @@ VOLUME ["/data"]
CMD /start.py
HEALTHCHECK --start-period=350s CMD /health.sh
RUN echo $VERSION >> /version
\ No newline at end of file
RUN echo $VERSION >> /version
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
......@@ -20,4 +20,4 @@ RUN mkdir -p /data
COPY fetchmail.py /fetchmail.py
CMD ["/fetchmail.py"]
RUN echo $VERSION >> /version
\ No newline at end of file
RUN echo $VERSION >> /version
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
......@@ -24,4 +24,4 @@ VOLUME ["/data"]
CMD radicale -S -C /radicale.conf
HEALTHCHECK CMD curl -f -L http://localhost:5232/ || exit 1
RUN echo $VERSION >> /version
\ No newline at end of file
RUN echo $VERSION >> /version
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
FROM $DISTRO
ARG VERSION
......@@ -30,4 +30,4 @@ EXPOSE 53/udp 53/tcp
CMD /start.py
HEALTHCHECK CMD dig @127.0.0.1 || exit 1
RUN echo $VERSION >> /version
\ No newline at end of file
RUN echo $VERSION >> /version
ARG DISTRO=alpine:3.14.2
ARG DISTRO=alpine:3.14.5
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
update alpine linux docker image to version 3.14.5 which includes a security fix for zlib’s CVE-2018-25032.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment