Upgrade s6-overlay to 3.1.6.2 version

instrumentisto · Nov 21, 2023 · d52ed7f · d52ed7f
1 parent 80a5aca
commit d52ed7f
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 25 deletions.
diff --git a/1.4/apache/Dockerfile b/1.4/apache/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:7.4-apache
 
 ARG roundcube_ver=1.4.15
-ARG s6_overlay_ver=3.1.6.1
+ARG s6_overlay_ver=3.1.6.2
 
 
 # Install s6-overlay

diff --git a/1.4/fpm/Dockerfile b/1.4/fpm/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:7.4-fpm-alpine3.16
 
 ARG roundcube_ver=1.4.15
-ARG s6_overlay_ver=3.1.6.1
+ARG s6_overlay_ver=3.1.6.2
 
 
 # Install s6-overlay

diff --git a/1.5/apache/Dockerfile b/1.5/apache/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:8.2-apache
 
 ARG roundcube_ver=1.5.6
-ARG s6_overlay_ver=3.1.6.1
+ARG s6_overlay_ver=3.1.6.2
 
 
 # Install s6-overlay

diff --git a/1.5/fpm/Dockerfile b/1.5/fpm/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:8.2-fpm-alpine3.18
 
 ARG roundcube_ver=1.5.6
-ARG s6_overlay_ver=3.1.6.1
+ARG s6_overlay_ver=3.1.6.2
 
 
 # Install s6-overlay

diff --git a/1.6/apache/Dockerfile b/1.6/apache/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:8.2-apache
 
 ARG roundcube_ver=1.6.5
-ARG s6_overlay_ver=3.1.6.1
+ARG s6_overlay_ver=3.1.6.2
 
 
 # Install s6-overlay

diff --git a/1.6/fpm/Dockerfile b/1.6/fpm/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:8.2-fpm-alpine3.18
 
 ARG roundcube_ver=1.6.5
-ARG s6_overlay_ver=3.1.6.1
+ARG s6_overlay_ver=3.1.6.2
 
 
 # Install s6-overlay

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
 
 
 
-## [1.6.5-r2] · 2023-??-??
-[1.6.5-r2]: /../../tree/1.6.5-r2
+## [1.6.5-r3] · 2023-11-21
+[1.6.5-r3]: /../../tree/1.6.5-r3
+
+[Diff](/../../compare/1.6.5-r2...1.6.5-r3)
+
+### Upgraded
 
-[Diff](/../../compare/1.6.5-r2...)
+- [s6-overlay] 3.1.6.2: <https://github.com/just-containers/s6-overlay/releases/tag/v3.1.6.2>
 
 ### Security updated
 
@@ -18,10 +22,14 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
-## [1.5.6-r2] · 2023-??-??
-[1.5.6-r2]: /../../tree/1.5.6-r2
+## [1.5.6-r3] · 2023-11-21
+[1.5.6-r3]: /../../tree/1.5.6-r3
+
+[Diff](/../../compare/1.5.6-r2...1.5.6-r3)
+
+### Upgraded
 
-[Diff](/../../compare/1.5.6-r2...)
+- [s6-overlay] 3.1.6.2: <https://github.com/just-containers/s6-overlay/releases/tag/v3.1.6.2>
 
 ### Security updated
 
@@ -30,6 +38,18 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
+## [1.4.15-r3] · 2023-11-21
+[1.4.15-r3]: /../../tree/1.4.15-r3
+
+[Diff](/../../compare/1.4.15-r2...1.4.15-r3)
+
+### Upgraded
+
+- [s6-overlay] 3.1.6.2: <https://github.com/just-containers/s6-overlay/releases/tag/v3.1.6.2>
+
+
+
+
 ## [1.6.5-r2] · 2023-11-20
 [1.6.5-r2]: /../../tree/1.6.5-r2
 

diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php
@@ -18,7 +18,7 @@
 <? } ?>
 
 ARG roundcube_ver=<?= $RoundcubeVer."\n"; ?>
-ARG s6_overlay_ver=3.1.6.1
+ARG s6_overlay_ver=3.1.6.2
 
 
 # Install s6-overlay

diff --git a/Makefile b/Makefile
@@ -23,12 +23,12 @@ REGISTRIES := $(strip $(subst $(comma), ,\
 	$(shell grep -m1 'registry: \["' .github/workflows/ci.yml \
 	        | cut -d':' -f2 | tr -d '"][')))
 ALL_IMAGES := \
-	1.6/apache:1.6.5-r2-apache,1.6.5-apache,1.6-apache,1-apache,apache,latest \
-	1.6/fpm:1.6.5-r2-fpm,1.6.5-fpm,1.6-fpm,1-fpm,fpm \
-	1.5/apache:1.5.6-r2-apache,1.5.6-apache,1.5-apache \
-	1.5/fpm:1.5.6-r2-fpm,1.5.6-fpm,1.5-fpm \
-	1.4/apache:1.4.15-r2-apache,1.4.15-apache,1.4-apache \
-	1.4/fpm:1.4.15-r2-fpm,1.4.15-fpm,1.4-fpm
+	1.6/apache:1.6.5-r3-apache,1.6.5-apache,1.6-apache,1-apache,apache,latest \
+	1.6/fpm:1.6.5-r3-fpm,1.6.5-fpm,1.6-fpm,1-fpm,fpm \
+	1.5/apache:1.5.6-r3-apache,1.5.6-apache,1.5-apache \
+	1.5/fpm:1.5.6-r3-fpm,1.5.6-fpm,1.5-fpm \
+	1.4/apache:1.4.15-r3-apache,1.4.15-apache,1.4-apache \
+	1.4/fpm:1.4.15-r3-fpm,1.4.15-fpm,1.4-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.6.5-r2-apache`, `1.6.5-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
-- [`1.6.5-r2-fpm`, `1.6.5-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
-- [`1.5.6-r2-apache`, `1.5.6-apache`, `1.5-apache`][103]
-- [`1.5.6-r2-fpm`, `1.5.6-fpm`, `1.5-fpm`][104]
-- [`1.4.15-r2-apache`, `1.4.15-apache`, `1.4-apache`][105]
-- [`1.4.15-r2-fpm`, `1.4.15-fpm`, `1.4-fpm`][106]
+- [`1.6.5-r3-apache`, `1.6.5-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
+- [`1.6.5-r3-fpm`, `1.6.5-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
+- [`1.5.6-r3-apache`, `1.5.6-apache`, `1.5-apache`][103]
+- [`1.5.6-r3-fpm`, `1.5.6-fpm`, `1.5-fpm`][104]
+- [`1.4.15-r3-apache`, `1.4.15-apache`, `1.4-apache`][105]
+- [`1.4.15-r3-fpm`, `1.4.15-fpm`, `1.4-fpm`][106]