Upgrade s6-overlay to 3.1.1.2 version

instrumentisto · Jun 30, 2022 · 6d9e59a · 6d9e59a
1 parent d68a38d
commit 6d9e59a
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 19 deletions.
diff --git a/1.3/apache/Dockerfile b/1.3/apache/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:7.4-apache
 
 ARG roundcube_ver=1.3.17
-ARG s6_overlay_ver=3.1.1.1
+ARG s6_overlay_ver=3.1.1.2
 
 
 # Install s6-overlay

diff --git a/1.3/fpm/Dockerfile b/1.3/fpm/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:7.4-fpm-alpine3.16
 
 ARG roundcube_ver=1.3.17
-ARG s6_overlay_ver=3.1.1.1
+ARG s6_overlay_ver=3.1.1.2
 
 
 # Install s6-overlay

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.13
-ARG s6_overlay_ver=3.1.1.1
+ARG s6_overlay_ver=3.1.1.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.13
-ARG s6_overlay_ver=3.1.1.1
+ARG s6_overlay_ver=3.1.1.2
 
 
 # Install s6-overlay

diff --git a/1.5/apache/Dockerfile b/1.5/apache/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:8.1-apache
 
 ARG roundcube_ver=1.5.3
-ARG s6_overlay_ver=3.1.1.1
+ARG s6_overlay_ver=3.1.1.2
 
 
 # Install s6-overlay

diff --git a/1.5/fpm/Dockerfile b/1.5/fpm/Dockerfile
@@ -5,7 +5,7 @@
 FROM php:8.1-fpm-alpine3.16
 
 ARG roundcube_ver=1.5.3
-ARG s6_overlay_ver=3.1.1.1
+ARG s6_overlay_ver=3.1.1.2
 
 
 # Install s6-overlay

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.3-r1] · 2022-06-30
+[1.5.3-r1]: /../../tree/1.5.3-r1
+
+[Diff](/../../compare/1.5.3-r0...1.5.3-r1)
+
+### Upgraded
+
+- [s6-overlay] 3.1.1.2: <https://github.com/just-containers/s6-overlay/releases/tag/v3.1.1.2>
+
+
+
+
+## [1.4.13-r9] · 2022-06-30
+[1.4.13-r9]: /../../tree/1.4.13-r9
+
+[Diff](/../../compare/1.4.13-r8...1.4.13-r9)
+
+### Upgraded
+
+- [s6-overlay] 3.1.1.2: <https://github.com/just-containers/s6-overlay/releases/tag/v3.1.1.2>
+
+
+
+
+## [1.3.17-r10] · 2022-06-30
+[1.3.17-r10]: /../../tree/1.3.17-r10
+
+[Diff](/../../compare/1.3.17-r9...1.3.17-r10)
+
+### Upgraded
+
+- [s6-overlay] 3.1.1.2: <https://github.com/just-containers/s6-overlay/releases/tag/v3.1.1.2>
+
+
+
+
 ## [1.5.3-r0] · 2022-06-27
 [1.5.3-r0]: /../../tree/1.5.3-r0
 

diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php
@@ -16,7 +16,7 @@
 <? } ?>
 
 ARG roundcube_ver=<?= $RoundcubeVer."\n"; ?>
-ARG s6_overlay_ver=3.1.1.1
+ARG s6_overlay_ver=3.1.1.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.5/apache:1.5.3-r0-apache,1.5.3-apache,1.5-apache,1-apache,apache,latest \
-	1.5/fpm:1.5.3-r0-fpm,1.5.3-fpm,1.5-fpm,1-fpm,fpm \
-	1.4/apache:1.4.13-r8-apache,1.4.13-apache,1.4-apache \
-	1.4/fpm:1.4.13-r8-fpm,1.4.13-fpm,1.4-fpm \
-	1.3/apache:1.3.17-r9-apache,1.3.17-apache,1.3-apache \
-	1.3/fpm:1.3.17-r9-fpm,1.3.17-fpm,1.3-fpm
+	1.5/apache:1.5.3-r1-apache,1.5.3-apache,1.5-apache,1-apache,apache,latest \
+	1.5/fpm:1.5.3-r1-fpm,1.5.3-fpm,1.5-fpm,1-fpm,fpm \
+	1.4/apache:1.4.13-r9-apache,1.4.13-apache,1.4-apache \
+	1.4/fpm:1.4.13-r9-fpm,1.4.13-fpm,1.4-fpm \
+	1.3/apache:1.3.17-r10-apache,1.3.17-apache,1.3-apache \
+	1.3/fpm:1.3.17-r10-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.3-r0-apache`, `1.5.3-apache`, `1.5-apache`, `1-apache`, `apache`, `latest`][101]
-- [`1.5.3-r0-fpm`, `1.5.3-fpm`, `1.5-fpm`, `1-fpm`, `fpm`][102]
-- [`1.4.13-r8-apache`, `1.4.13-apache`, `1.4-apache`][103]
-- [`1.4.13-r8-fpm`, `1.4.13-fpm`, `1.4-fpm`][104]
-- [`1.3.17-r9-apache`, `1.3.17-apache`, `1.3-apache`][105]
-- [`1.3.17-r9-fpm`, `1.3.17-fpm`, `1.3-fpm`][106]
+- [`1.5.3-r1-apache`, `1.5.3-apache`, `1.5-apache`, `1-apache`, `apache`, `latest`][101]
+- [`1.5.3-r1-fpm`, `1.5.3-fpm`, `1.5-fpm`, `1-fpm`, `fpm`][102]
+- [`1.4.13-r9-apache`, `1.4.13-apache`, `1.4-apache`][103]
+- [`1.4.13-r9-fpm`, `1.4.13-fpm`, `1.4-fpm`][104]
+- [`1.3.17-r10-apache`, `1.3.17-apache`, `1.3-apache`][105]
+- [`1.3.17-r10-fpm`, `1.3.17-fpm`, `1.3-fpm`][106]