Upgrade s6-overlay to 3.1.6.0 version

instrumentisto · Nov 7, 2023 · 8ab5cc0 · 8ab5cc0
1 parent 689412b
commit 8ab5cc0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
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
 
 
 
-## [2.11.0-Beta2-r6] · 2023-??-??
-[2.11.0-Beta2-r6]: /../../tree/2.11.0-Beta2-r6
+## [2.11.0-Beta2-r7] · 2023-11-07
+[2.11.0-Beta2-r7]: /../../tree/2.11.0-Beta2-r7
+
+[Diff](/../../compare/2.11.0-Beta2-r6...2.11.0-Beta2-r7)
+
+### Upgraded
 
-[Diff](/../../compare/2.11.0-Beta2-r6...)
+- [s6-overlay] 3.1.6.0: <https://github.com/just-containers/s6-overlay/releases/tag/v3.1.6.0>
 
 ### Security updated
 

diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php
@@ -15,7 +15,7 @@
 <? } ?>
 
 ARG opendkim_ver=<?= explode('-', $var['version'])[0].'-'.explode('-', $var['version'])[1]."\n"; ?>
-ARG s6_overlay_ver=3.1.5.0
+ARG s6_overlay_ver=3.1.6.0
 
 
 # Build and install OpenDKIM

diff --git a/Makefile b/Makefile
@@ -23,8 +23,8 @@ REGISTRIES := $(strip $(subst $(comma), ,\
 	$(shell grep -m1 'registry: \["' .github/workflows/ci.yml \
 	        | cut -d':' -f2 | tr -d '"][')))
 ALL_IMAGES := \
-	debian:2.11.0-Beta2-r6,2.11.0-Beta2,2.11,2,latest \
-	alpine:2.11.0-Beta2-r6-alpine,2.11.0-Beta2-alpine,2.11-alpine,2-alpine,alpine
+	debian:2.11.0-Beta2-r7,2.11.0-Beta2,2.11,2,latest \
+	alpine:2.11.0-Beta2-r7-alpine,2.11.0-Beta2-alpine,2.11-alpine,2-alpine,alpine
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Default is first image from ALL_IMAGES list.

diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@ OpenDKIM Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`2.11.0-Beta2-r6`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101]
-- [`2.11.0-Beta2-r6-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102]
+- [`2.11.0-Beta2-r7`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101]
+- [`2.11.0-Beta2-r7-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102]
 
 
 

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -5,7 +5,7 @@
 FROM alpine:3.18
 
 ARG opendkim_ver=2.11.0-Beta2
-ARG s6_overlay_ver=3.1.5.0
+ARG s6_overlay_ver=3.1.6.0
 
 
 # Build and install OpenDKIM

diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -5,7 +5,7 @@
 FROM debian:bookworm-slim
 
 ARG opendkim_ver=2.11.0-Beta2
-ARG s6_overlay_ver=3.1.5.0
+ARG s6_overlay_ver=3.1.6.0
 
 
 # Build and install OpenDKIM