From 604a789cf15939ee6cbdff34698abc138eacd83f Mon Sep 17 00:00:00 2001 From: tyranron Date: Fri, 11 Oct 2024 13:21:11 +0300 Subject: [PATCH] Upgrade s6-overlay to 3.2.0.2 version --- CHANGELOG.md | 10 +++++++--- Dockerfile.tmpl.php | 2 +- Makefile | 4 ++-- README.md | 4 ++-- alpine/Dockerfile | 2 +- debian/Dockerfile | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 613b209..e1b478c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,14 @@ All user visible changes to this project will be documented in this file. This p -## [2.11.0-Beta2-r17] · 2024-??-?? (unreleased) -[2.11.0-Beta2-r17]: /../../tree/2.11.0-Beta2-r17 +## [2.11.0-Beta2-r18] · 2024-10-11 +[2.11.0-Beta2-r18]: /../../tree/2.11.0-Beta2-r18 + +[Diff](/../../compare/2.11.0-Beta2-r17...2.11.0-Beta2-r18) + +### Upgraded -[Diff](/../../compare/2.11.0-Beta2-r17...) +- [s6-overlay] 3.2.0.2: ### Security updated diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php index c40306f..84c52d1 100644 --- a/Dockerfile.tmpl.php +++ b/Dockerfile.tmpl.php @@ -15,7 +15,7 @@ ARG opendkim_ver= -ARG s6_overlay_ver=3.2.0.0 +ARG s6_overlay_ver=3.2.0.2 # Build and install OpenDKIM diff --git a/Makefile b/Makefile index ba74e3e..317f0bc 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,8 @@ REGISTRIES := $(strip $(subst $(comma), ,\ $(shell grep -m1 'registry: \["' .github/workflows/ci.yml \ | cut -d':' -f2 | tr -d '"]['))) ALL_IMAGES := \ - debian:2.11.0-Beta2-r17,2.11.0-Beta2,2.11,2,latest \ - alpine:2.11.0-Beta2-r17-alpine,2.11.0-Beta2-alpine,2.11-alpine,2-alpine,alpine + debian:2.11.0-Beta2-r18,2.11.0-Beta2,2.11,2,latest \ + alpine:2.11.0-Beta2-r18-alpine,2.11.0-Beta2-alpine,2.11-alpine,2-alpine,alpine # :,,,... # Default is first image from ALL_IMAGES list. diff --git a/README.md b/README.md index 45e5975..e943260 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ OpenDKIM Docker image ## Supported tags and respective `Dockerfile` links -- [`2.11.0-Beta2-r17`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101] -- [`2.11.0-Beta2-r17-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102] +- [`2.11.0-Beta2-r18`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101] +- [`2.11.0-Beta2-r18-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102] diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 0859276..d6b1706 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.20 ARG opendkim_ver=2.11.0-Beta2 -ARG s6_overlay_ver=3.2.0.0 +ARG s6_overlay_ver=3.2.0.2 # Build and install OpenDKIM diff --git a/debian/Dockerfile b/debian/Dockerfile index 5d3ab68..67dc1fe 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -5,7 +5,7 @@ FROM debian:bookworm-slim ARG opendkim_ver=2.11.0-Beta2 -ARG s6_overlay_ver=3.2.0.0 +ARG s6_overlay_ver=3.2.0.2 # Build and install OpenDKIM