Upgrade s6-overlay to 3.1.6.0 version

CHANGELOG.md

@@ -6,10 +6,14 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
-## [1.4.2-r28] · 2023-??-??
-[1.4.2-r28]: /../../tree/1.4.2-r28
+## [1.4.2-r29] · 2023-11-07
+[1.4.2-r29]: /../../tree/1.4.2-r29
+
+[Diff](/../../compare/1.4.2-r28...1.4.2-r29)
+
+### Upgraded
 
-[Diff](/../../compare/1.4.2-r28...)
+- [s6-overlay] 3.1.6.0: <https://github.com/just-containers/s6-overlay/releases/tag/v3.1.6.0>
 
 ### Security updated
 

Dockerfile.tmpl.php

@@ -7,13 +7,13 @@
 
 <? if ($isAlpineImage) { ?>
 # https://hub.docker.com/_/alpine
-FROM alpine:3.18.4
+FROM alpine:3.18
 <? } else { ?>
 # https://hub.docker.com/_/debian
 FROM debian:bookworm-slim
 <? } ?>
 
-ARG s6_overlay_ver=3.1.5.0
+ARG s6_overlay_ver=3.1.6.0
 
 
 # Build and install OpenDMARC

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:1.4.2-r28,1.4.2,1.4,1,latest \
-	alpine:1.4.2-r28-alpine,1.4.2-alpine,1.4-alpine,1-alpine,alpine
+	debian:1.4.2-r29,1.4.2,1.4,1,latest \
+	alpine:1.4.2-r29-alpine,1.4.2-alpine,1.4-alpine,1-alpine,alpine
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Default is first image from ALL_IMAGES list.

alpine/Dockerfile

@@ -2,9 +2,9 @@
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.tmpl.php
 
 # https://hub.docker.com/_/alpine
-FROM alpine:3.18.4
+FROM alpine:3.18
 
-ARG s6_overlay_ver=3.1.5.0
+ARG s6_overlay_ver=3.1.6.0
 
 
 # Build and install OpenDMARC

debian/Dockerfile

@@ -4,7 +4,7 @@
 # https://hub.docker.com/_/debian
 FROM debian:bookworm-slim
 
-ARG s6_overlay_ver=3.1.5.0
+ARG s6_overlay_ver=3.1.6.0
 
 
 # Build and install OpenDMARC