Upgrade to s6-2.12.0.2 (supervisor restart bugfix). Tag: v3.1.6.2

Signed-off-by: Laurent Bercot <ska@appnovation.com>
just-containers · Nov 20, 2023 · 941fbd8 · 941fbd8
1 parent 134dad0
commit 941fbd8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ Build the following Dockerfile and try it out:
 ```
 # Use your favorite image
 FROM ubuntu
-ARG S6_OVERLAY_VERSION=3.1.6.1
+ARG S6_OVERLAY_VERSION=3.1.6.2
 
 RUN apt-get update && apt-get install -y nginx xz-utils
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf
@@ -956,7 +956,7 @@ RUN cd /tmp && sha256sum -c *.sha256
 
 ### `USER` directive
 
-As of version 3.1.6.1, s6-overlay has limited support for running as a user other than `root`:
+As of version 3.1.6.2, s6-overlay has limited support for running as a user other than `root`:
 
 * Tools like `fix-attrs` and `logutil-service` are unlikely to work (they rely
   on being able to change UIDs).

diff --git a/conf/defaults.mk b/conf/defaults.mk
@@ -3,7 +3,7 @@
 # e.g.: make SHEBANGDIR=/usr/bin VERSION=3.1.6.0
 
 # The version of the software being built.
-VERSION := 3.1.6.1
+VERSION := 3.1.6.2
 
 # Where stuff is going to be built. Change for out-of-tree builds.
 OUTPUT := output

diff --git a/conf/versions b/conf/versions
@@ -12,8 +12,8 @@ SKALIBS_VERSION=v2.14.0.1
 # EXECLINE_VERSION=813a7ae859c0563f87c2afef79d346b853c20e36
 EXECLINE_VERSION=v2.9.4.0
 
-# S6_VERSION=2598c3ce94f6f292bdd234020709af034c27d262
-S6_VERSION=v2.12.0.1
+# S6_VERSION=8d032b7ff814b08aba0b23c03cdd589eae98d22a
+S6_VERSION=v2.12.0.2
 
 # S6_RC_VERSION=940e4bb20f7927a54c9ee92bcea1c54f8b60666d
 S6_RC_VERSION=v0.5.4.2