From 1f9e638601de27d558d3593c76ee9037ce3edab9 Mon Sep 17 00:00:00 2001
From: Bryan Latten <latten@adobe.com>
Date: Tue, 24 Jan 2017 16:51:19 -0500
Subject: [PATCH] Dockerfile: updated S6 to v1.19.1.1

---
 Dockerfile        | 2 +-
 Dockerfile-alpine | 2 +-
 Dockerfile-centos | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9632d00..3d1ca78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV SIGNAL_BUILD_STOP=99 \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
     S6_KILL_FINISH_MAXTIME=5000 \
     S6_KILL_GRACETIME=3000 \
-    S6_VERSION=v1.18.1.5 \
+    S6_VERSION=v1.19.1.1 \
     GOSS_VERSION=v0.2.5
 
 # Ensure scripts are available for use in next command
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index b385db7..b5d40e5 100644
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -7,7 +7,7 @@ ENV SIGNAL_BUILD_STOP=99 \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
     S6_KILL_FINISH_MAXTIME=5000 \
     S6_KILL_GRACETIME=3000 \
-    S6_VERSION=v1.18.1.5 \
+    S6_VERSION=v1.19.1.1 \
     GOSS_VERSION=v0.2.5
 
 # Ensure scripts are available for use in next command
diff --git a/Dockerfile-centos b/Dockerfile-centos
index c838bbd..5c0c1cf 100644
--- a/Dockerfile-centos
+++ b/Dockerfile-centos
@@ -7,7 +7,7 @@ ENV SIGNAL_BUILD_STOP=99 \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
     S6_KILL_FINISH_MAXTIME=5000 \
     S6_KILL_GRACETIME=3000 \
-    S6_VERSION=v1.18.1.5 \
+    S6_VERSION=v1.19.1.1 \
     GOSS_VERSION=v0.2.5
 
 # Ensure scripts are available for use in next command
@@ -22,8 +22,8 @@ RUN ln -s /scripts/clean_centos.sh /clean.sh && \
     /bin/bash -e /security_updates.sh && \
     /bin/bash -e /clean.sh && \
     curl -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz -o /tmp/s6.tar.gz && \
-    tar xzf /tmp/s6.tar.gz -C / --exclude="./bin" --exclude="./sbin" && \
-    tar xzf /tmp/s6.tar.gz -C /usr ./bin ./sbin && \
+    tar xzf /tmp/s6.tar.gz -C / --exclude="./bin" && \
+    tar xzf /tmp/s6.tar.gz -C /usr ./bin && \
     rm -f /tmp/s6.tar.gz && \
     curl -L https://github.com/aelsabbahy/goss/releases/download/${GOSS_VERSION}/goss-linux-amd64 -o /usr/local/bin/goss && \
     chmod +x /usr/local/bin/goss