Upgrade Alpine to 3.16 version

instrumentisto · May 26, 2022 · 57c179d · 57c179d
1 parent 05d065b
commit 57c179d
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 16 deletions.
diff --git a/1.3/fpm/Dockerfile b/1.3/fpm/Dockerfile
@@ -2,7 +2,7 @@
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.tmpl.php
 
 # https://hub.docker.com/_/php
-FROM php:7.4-fpm-alpine3.15
+FROM php:7.4-fpm-alpine3.16
 
 ARG roundcube_ver=1.3.17
 ARG s6_overlay_ver=3.1.0.1

diff --git a/1.4/fpm/Dockerfile b/1.4/fpm/Dockerfile
@@ -2,7 +2,7 @@
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.tmpl.php
 
 # https://hub.docker.com/_/php
-FROM php:7.4-fpm-alpine3.15
+FROM php:7.4-fpm-alpine3.16
 
 ARG roundcube_ver=1.4.13
 ARG s6_overlay_ver=3.1.0.1

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.1-fpm-alpine3.15
+FROM php:8.1-fpm-alpine3.16
 
 ARG roundcube_ver=1.5.2
 ARG s6_overlay_ver=3.1.0.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,42 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
+## [1.5.2-r6] · 2022-05-26
+[1.5.2-r6]: /../../tree/1.5.2-r6
+
+[Diff](/../../compare/1.5.2-r5...1.5.2-r6)
+
+### Upgraded
+
+- [Alpine Linux] 3.16: <https://www.alpinelinux.org/posts/Alpine-3.16.0-released.html>
+
+
+
+
+## [1.4.13-r6] · 2022-05-26
+[1.4.13-r6]: /../../tree/1.4.13-r6
+
+[Diff](/../../compare/1.4.13-r5...1.4.13-r6)
+
+### Upgraded
+
+- [Alpine Linux] 3.16: <https://www.alpinelinux.org/posts/Alpine-3.16.0-released.html>
+
+
+
+
+## [1.3.17-r7] · 2022-05-26
+[1.3.17-r7]: /../../tree/1.3.17-r7
+
+[Diff](/../../compare/1.3.17-r6...1.3.17-r7)
+
+### Upgraded
+
+- [Alpine Linux] 3.16: <https://www.alpinelinux.org/posts/Alpine-3.16.0-released.html>
+
+
+
+
 ## [1.5.2-r5] · 2022-04-06
 [1.5.2-r5]: /../../tree/1.5.2-r5
 

diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php
@@ -12,7 +12,7 @@
 <? if ($isApacheImage) { ?>
 FROM php:<?= $phpVer; ?>-apache
 <? } else { ?>
-FROM php:<?= $phpVer; ?>-fpm-alpine3.15
+FROM php:<?= $phpVer; ?>-fpm-alpine3.16
 <? } ?>
 
 ARG roundcube_ver=<?= $RoundcubeVer."\n"; ?>

diff --git a/Makefile b/Makefile
@@ -22,12 +22,12 @@ NAMESPACES := instrumentisto \
               quay.io/instrumentisto
 NAME := roundcube
 ALL_IMAGES := \
-	1.5/apache:1.5.2-r5-apache,1.5.2-apache,1.5-apache,1-apache,apache,latest \
-	1.5/fpm:1.5.2-r5-fpm,1.5.2-fpm,1.5-fpm,1-fpm,fpm \
-	1.4/apache:1.4.13-r5-apache,1.4.13-apache,1.4-apache \
-	1.4/fpm:1.4.13-r5-fpm,1.4.13-fpm,1.4-fpm \
-	1.3/apache:1.3.17-r6-apache,1.3.17-apache,1.3-apache \
-	1.3/fpm:1.3.17-r6-fpm,1.3.17-fpm,1.3-fpm
+	1.5/apache:1.5.2-r6-apache,1.5.2-apache,1.5-apache,1-apache,apache,latest \
+	1.5/fpm:1.5.2-r6-fpm,1.5.2-fpm,1.5-fpm,1-fpm,fpm \
+	1.4/apache:1.4.13-r6-apache,1.4.13-apache,1.4-apache \
+	1.4/fpm:1.4.13-r6-fpm,1.4.13-fpm,1.4-fpm \
+	1.3/apache:1.3.17-r7-apache,1.3.17-apache,1.3-apache \
+	1.3/fpm:1.3.17-r7-fpm,1.3.17-fpm,1.3-fpm
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Default is first image from ALL_IMAGES list.

diff --git a/README.md b/README.md
@@ -17,12 +17,12 @@ Roundcube Webmail Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`1.5.2-r5-apache`, `1.5.2-apache`, `1.5-apache`, `1-apache`, `apache`, `latest`][101]
-- [`1.5.2-r5-fpm`, `1.5.2-fpm`, `1.5-fpm`, `1-fpm`, `fpm`][102]
-- [`1.4.13-r5-apache`, `1.4.13-apache`, `1.4-apache`][103]
-- [`1.4.13-r5-fpm`, `1.4.13-fpm`, `1.4-fpm`][104]
-- [`1.3.17-r6-apache`, `1.3.17-apache`, `1.3-apache`][105]
-- [`1.3.17-r6-fpm`, `1.3.17-fpm`, `1.3-fpm`][106]
+- [`1.5.2-r6-apache`, `1.5.2-apache`, `1.5-apache`, `1-apache`, `apache`, `latest`][101]
+- [`1.5.2-r6-fpm`, `1.5.2-fpm`, `1.5-fpm`, `1-fpm`, `fpm`][102]
+- [`1.4.13-r6-apache`, `1.4.13-apache`, `1.4-apache`][103]
+- [`1.4.13-r6-fpm`, `1.4.13-fpm`, `1.4-fpm`][104]
+- [`1.3.17-r7-apache`, `1.3.17-apache`, `1.3-apache`][105]
+- [`1.3.17-r7-fpm`, `1.3.17-fpm`, `1.3-fpm`][106]