Upgrade s6-overlay to 3.2.0.0 version

instrumentisto · Jun 10, 2024 · a9d6d1a · a9d6d1a
1 parent 5090bf8
commit a9d6d1a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,18 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
+## [2.11.0-Beta2-r14] · 2024-06-10
+[2.11.0-Beta2-r14]: /../../tree/2.11.0-Beta2-r14
+
+[Diff](/../../compare/2.11.0-Beta2-r13...2.11.0-Beta2-r14)
+
+### Upgraded
+
+- [s6-overlay] 3.2.0.0: <https://github.com/just-containers/s6-overlay/releases/tag/v3.2.0.0>
+
+
+
+
 ## [2.11.0-Beta2-r13] · 2024-05-24
 [2.11.0-Beta2-r13]: /../../tree/2.11.0-Beta2-r13
 

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.6.2
+ARG s6_overlay_ver=3.2.0.0
 
 
 # Build and install OpenDKIM
@@ -177,7 +177,8 @@
 
 ENV S6_KEEP_ENV=1 \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
-    S6_CMD_WAIT_FOR_SERVICES=1
+    S6_CMD_WAIT_FOR_SERVICES=1 \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000
 
 
 COPY rootfs /

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-r13,2.11.0-Beta2,2.11,2,latest \
-	alpine:2.11.0-Beta2-r13-alpine,2.11.0-Beta2-alpine,2.11-alpine,2-alpine,alpine
+	debian:2.11.0-Beta2-r14,2.11.0-Beta2,2.11,2,latest \
+	alpine:2.11.0-Beta2-r14-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-r13`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101]
-- [`2.11.0-Beta2-r13-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102]
+- [`2.11.0-Beta2-r14`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101]
+- [`2.11.0-Beta2-r14-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.20
 
 ARG opendkim_ver=2.11.0-Beta2
-ARG s6_overlay_ver=3.1.6.2
+ARG s6_overlay_ver=3.2.0.0
 
 
 # Build and install OpenDKIM
@@ -101,7 +101,8 @@ RUN apk add --update --no-cache --virtual .tool-deps \
 
 ENV S6_KEEP_ENV=1 \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
-    S6_CMD_WAIT_FOR_SERVICES=1
+    S6_CMD_WAIT_FOR_SERVICES=1 \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000
 
 
 COPY rootfs /

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.6.2
+ARG s6_overlay_ver=3.2.0.0
 
 
 # Build and install OpenDKIM
@@ -110,7 +110,8 @@ RUN apt-get update \
 
 ENV S6_KEEP_ENV=1 \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
-    S6_CMD_WAIT_FOR_SERVICES=1
+    S6_CMD_WAIT_FOR_SERVICES=1 \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000
 
 
 COPY rootfs /