Upgrade Alpine to 3.21 version

instrumentisto · Dec 11, 2024 · 21b1fdb · 21b1fdb
1 parent 1996505
commit 21b1fdb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/1.5/fpm/Dockerfile b/1.5/fpm/Dockerfile
@@ -2,7 +2,7 @@
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.tmpl.php
 
 # https://hub.docker.com/_/php
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21
 
 ARG roundcube_ver=1.5.9
 ARG s6_overlay_ver=3.2.0.2

diff --git a/1.6/fpm/Dockerfile b/1.6/fpm/Dockerfile
@@ -2,7 +2,7 @@
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.tmpl.php
 
 # https://hub.docker.com/_/php
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21
 
 ARG roundcube_ver=1.6.9
 ARG s6_overlay_ver=3.2.0.2

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
 
 
 
-## [main] · (unreleased)
-[main]: /../../tree/main
+## [1.6.9-r3] · 2024-12-11
+[1.6.9-r3]: /../../tree/1.6.9-r3
 
-[Diff](/../../compare/1.6.9-r2...main)
+[Diff](/../../compare/1.6.9-r2...1.6.9-r3)
+
+### Upgraded
+
+- [Alpine Linux] 3.21: <https://www.alpinelinux.org/posts/Alpine-3.21.0-released.html>
 
 ### Security updated
 
@@ -18,10 +22,14 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
-## [main] · (unreleased)
-[main]: /../../tree/main
+## [1.5.9-r2] · 2024-12-11
+[1.5.9-r2]: /../../tree/1.5.9-r2
+
+[Diff](/../../compare/1.5.9-r2...1.5.9-r2)
+
+### Upgraded
 
-[Diff](/../../compare/1.5.9-r2...main)
+- [Alpine Linux] 3.21: <https://www.alpinelinux.org/posts/Alpine-3.21.0-released.html>
 
 ### Security updated
 

diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php
@@ -4,7 +4,7 @@
 $RoundcubeVer = explode('-', $var['version'])[0];
 $isMinorVerGt5 = (intval(explode('.', $RoundcubeVer)[1]) > 5);
 $phpVer = '8.2';
-$alpineVer = '3.20';
+$alpineVer = '3.21';
 ?>
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.tmpl.php

diff --git a/Makefile b/Makefile
@@ -23,10 +23,10 @@ REGISTRIES := $(strip $(subst $(comma), ,\
 	$(shell grep -m1 'registry: \["' .github/workflows/ci.yml \
 	        | cut -d':' -f2 | tr -d '"][')))
 ALL_IMAGES := \
-	1.6/apache:1.6.9-r2-apache,1.6.9-apache,1.6-apache,1-apache,apache,latest \
-	1.6/fpm:1.6.9-r2-fpm,1.6.9-fpm,1.6-fpm,1-fpm,fpm \
-	1.5/apache:1.5.9-r2-apache,1.5.9-apache,1.5-apache \
-	1.5/fpm:1.5.9-r2-fpm,1.5.9-fpm,1.5-fpm
+	1.6/apache:1.6.9-r3-apache,1.6.9-apache,1.6-apache,1-apache,apache,latest \
+	1.6/fpm:1.6.9-r3-fpm,1.6.9-fpm,1.6-fpm,1-fpm,fpm \
+	1.5/apache:1.5.9-r3-apache,1.5.9-apache,1.5-apache \
+	1.5/fpm:1.5.9-r3-fpm,1.5.9-fpm,1.5-fpm
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Default is first image from ALL_IMAGES list.

diff --git a/README.md b/README.md
@@ -17,10 +17,10 @@ Roundcube Webmail Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`1.6.9-r2-apache`, `1.6.9-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
-- [`1.6.9-r2-fpm`, `1.6.9-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
-- [`1.5.9-r2-apache`, `1.5.9-apache`, `1.5-apache`][103]
-- [`1.5.9-r2-fpm`, `1.5.9-fpm`, `1.5-fpm`][104]
+- [`1.6.9-r3-apache`, `1.6.9-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
+- [`1.6.9-r3-fpm`, `1.6.9-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
+- [`1.5.9-r3-apache`, `1.5.9-apache`, `1.5-apache`][103]
+- [`1.5.9-r3-fpm`, `1.5.9-fpm`, `1.5-fpm`][104]