Upgrade Alpine to 3.20 version

instrumentisto · May 24, 2024 · 5090bf8 · 5090bf8
1 parent d95635e
commit 5090bf8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git 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-r12] · 2024-??-?? (unreleased)
-[2.11.0-Beta2-r12]: /../../tree/2.11.0-Beta2-r12
+## [2.11.0-Beta2-r13] · 2024-05-24
+[2.11.0-Beta2-r13]: /../../tree/2.11.0-Beta2-r13
+
+[Diff](/../../compare/2.11.0-Beta2-r12...2.11.0-Beta2-r13)
+
+### Upgraded
 
-[Diff](/../../compare/2.11.0-Beta2-r12...)
+- [Alpine Linux] 3.20: <https://alpinelinux.org/posts/Alpine-3.20.0-released.html>
 
 ### Security updated
 

diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php
@@ -8,7 +8,7 @@
 
 <? if ($isAlpineImage) { ?>
 # https://hub.docker.com/_/alpine
-FROM alpine:3.19
+FROM alpine:3.20
 <? } else { ?>
 # https://hub.docker.com/_/debian
 FROM debian:bookworm-slim

diff --git 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-r12,2.11.0-Beta2,2.11,2,latest \
-	alpine:2.11.0-Beta2-r12-alpine,2.11.0-Beta2-alpine,2.11-alpine,2-alpine,alpine
+	debian:2.11.0-Beta2-r13,2.11.0-Beta2,2.11,2,latest \
+	alpine:2.11.0-Beta2-r13-alpine,2.11.0-Beta2-alpine,2.11-alpine,2-alpine,alpine
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Default is first image from ALL_IMAGES list.

diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@ OpenDKIM Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`2.11.0-Beta2-r12`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101]
-- [`2.11.0-Beta2-r12-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102]
+- [`2.11.0-Beta2-r13`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101]
+- [`2.11.0-Beta2-r13-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102]
 
 
 

diff --git 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.19
+FROM alpine:3.20
 
 ARG opendkim_ver=2.11.0-Beta2
 ARG s6_overlay_ver=3.1.6.2