diff --git a/CHANGELOG.md b/CHANGELOG.md index d4eedeb..fbc112b 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 -## [main] · (unreleased) -[main]: /../../tree/main +## [2.11.0-Beta2-r19] · 2024-12-06 +[2.11.0-Beta2-r19]: /../../tree/2.11.0-Beta2-r19 -[Diff](/../../compare/2.11.0-Beta2-r18...main) +[Diff](/../../compare/2.11.0-Beta2-r18...2.11.0-Beta2-r19) + +### Upgraded + +- [Alpine Linux] 3.21: ### Security updated diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php index 84c52d1..cdde6fa 100644 --- a/Dockerfile.tmpl.php +++ b/Dockerfile.tmpl.php @@ -8,7 +8,7 @@ # https://hub.docker.com/_/alpine -FROM alpine:3.20 +FROM alpine:3.21 # https://hub.docker.com/_/debian FROM debian:bookworm-slim diff --git a/Makefile b/Makefile index 317f0bc..c69e9ac 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-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 + debian:2.11.0-Beta2-r19,2.11.0-Beta2,2.11,2,latest \ + alpine:2.11.0-Beta2-r19-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 e943260..2d9e2fe 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ OpenDKIM Docker image ## Supported tags and respective `Dockerfile` links -- [`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] +- [`2.11.0-Beta2-r19`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101] +- [`2.11.0-Beta2-r19-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102] diff --git a/alpine/Dockerfile b/alpine/Dockerfile index d6b1706..16b8030 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -2,7 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.tmpl.php # https://hub.docker.com/_/alpine -FROM alpine:3.20 +FROM alpine:3.21 ARG opendkim_ver=2.11.0-Beta2 ARG s6_overlay_ver=3.2.0.2