-
- Downloads
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 a54a7841 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:Will <will@packer-output-c8fcfb40-3d93-4475-8f87-e14a9dd683b6> Co-authored-by:
Florent Daigniere <nextgens@users.noreply.github.com>
Showing
- core/admin/Dockerfile 2 additions, 2 deletionscore/admin/Dockerfile
- core/dovecot/Dockerfile 2 additions, 2 deletionscore/dovecot/Dockerfile
- core/nginx/Dockerfile 2 additions, 2 deletionscore/nginx/Dockerfile
- core/none/Dockerfile 1 addition, 1 deletioncore/none/Dockerfile
- core/postfix/Dockerfile 2 additions, 2 deletionscore/postfix/Dockerfile
- optional/clamav/Dockerfile 2 additions, 2 deletionsoptional/clamav/Dockerfile
- optional/fetchmail/Dockerfile 2 additions, 2 deletionsoptional/fetchmail/Dockerfile
- optional/radicale/Dockerfile 2 additions, 2 deletionsoptional/radicale/Dockerfile
- optional/unbound/Dockerfile 2 additions, 2 deletionsoptional/unbound/Dockerfile
- setup/Dockerfile 2 additions, 2 deletionssetup/Dockerfile
- towncrier/newsfragments/2302.bugfix 1 addition, 0 deletionstowncrier/newsfragments/2302.bugfix
Loading
Please register or sign in to comment