From 923d340622d8dad60aee18b467decc515e0692e4 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Fri, 24 May 2024 16:51:03 +0200
Subject: [PATCH] Upgrade Alpine to 3.20 version

---
 1.5/fpm/Dockerfile  |  2 +-
 1.6/fpm/Dockerfile  |  2 +-
 CHANGELOG.md        | 24 ++++++++++++++++++++++++
 Dockerfile.tmpl.php |  2 +-
 Makefile            |  8 ++++----
 README.md           |  8 ++++----
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/1.5/fpm/Dockerfile b/1.5/fpm/Dockerfile
index 9ab2fa3..a753154 100644
--- 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.19
+FROM php:8.2-fpm-alpine3.20
 
 ARG roundcube_ver=1.5.7
 ARG s6_overlay_ver=3.1.6.2
diff --git a/1.6/fpm/Dockerfile b/1.6/fpm/Dockerfile
index e83d3b1..bc3bf6b 100644
--- 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.19
+FROM php:8.2-fpm-alpine3.20
 
 ARG roundcube_ver=1.6.7
 ARG s6_overlay_ver=3.1.6.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93a9f3d..fcb367d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,30 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
+## [1.6.7-r1] · 2024-05-24
+[1.6.7-r1]: /../../tree/1.6.7-r1
+
+[Diff](/../../compare/1.6.7-r0...1.6.7-r1)
+
+### Upgraded
+
+- [Alpine Linux] 3.20: <https://alpinelinux.org/posts/Alpine-3.20.0-released.html>
+
+
+
+
+## [1.5.7-r1] · 2024-05-24
+[1.5.7-r1]: /../../tree/1.5.7-r1
+
+[Diff](/../../compare/1.5.7-r0...1.5.7-r1)
+
+### Upgraded
+
+- [Alpine Linux] 3.20: <https://alpinelinux.org/posts/Alpine-3.20.0-released.html>
+
+
+
+
 ## [1.6.7-r0] · 2024-05-20
 [1.6.7-r0]: /../../tree/1.6.7-r0
 
diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php
index 0040760..7744ac8 100644
--- 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.19';
+$alpineVer = '3.20';
 ?>
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.tmpl.php
diff --git a/Makefile b/Makefile
index debedad..cc73050 100644
--- 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.7-r0-apache,1.6.7-apache,1.6-apache,1-apache,apache,latest \
-	1.6/fpm:1.6.7-r0-fpm,1.6.7-fpm,1.6-fpm,1-fpm,fpm \
-	1.5/apache:1.5.7-r0-apache,1.5.7-apache,1.5-apache \
-	1.5/fpm:1.5.7-r0-fpm,1.5.7-fpm,1.5-fpm
+	1.6/apache:1.6.7-r1-apache,1.6.7-apache,1.6-apache,1-apache,apache,latest \
+	1.6/fpm:1.6.7-r1-fpm,1.6.7-fpm,1.6-fpm,1-fpm,fpm \
+	1.5/apache:1.5.7-r1-apache,1.5.7-apache,1.5-apache \
+	1.5/fpm:1.5.7-r1-fpm,1.5.7-fpm,1.5-fpm
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Default is first image from ALL_IMAGES list.
diff --git a/README.md b/README.md
index 727f438..1c0475f 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,10 @@ Roundcube Webmail Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`1.6.7-r0-apache`, `1.6.7-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
-- [`1.6.7-r0-fpm`, `1.6.7-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
-- [`1.5.7-r0-apache`, `1.5.7-apache`, `1.5-apache`][103]
-- [`1.5.7-r0-fpm`, `1.5.7-fpm`, `1.5-fpm`][104]
+- [`1.6.7-r1-apache`, `1.6.7-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
+- [`1.6.7-r1-fpm`, `1.6.7-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
+- [`1.5.7-r1-apache`, `1.5.7-apache`, `1.5-apache`][103]
+- [`1.5.7-r1-fpm`, `1.5.7-fpm`, `1.5-fpm`][104]