From 6f90990ddee405952782569773f51c477fa29051 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Sat, 9 Jul 2016 11:14:42 +0100
Subject: [PATCH 1/2] stop fetching nobin for s6 overlay and install per
 architecture version

---
 Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 071b62f..8ad9076 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,10 @@ FROM gliderlabs/alpine:3.4
 MAINTAINER sparklyballs
 
 # set version for s6 overlay
-ARG OVERLAY_VERSION="v1.18.1.0"
+ARG OVERLAY_VERSION="v1.18.1.3"
+ARG OVERLAY_ARCH="amd64"
+ARG OVERLAY_URL="https://github.com/just-containers/s6-overlay/releases/download"
+ARG OVERLAY_WWW="${OVERLAY_URL}"/"${OVERLAY_VERSION}"/s6-overlay-"${OVERLAY_ARCH}".tar.gz
 
 # set some environment variables
 ENV PS1="$(whoami)@$(hostname):$(pwd)$ " \
@@ -17,8 +20,6 @@ RUN \
 
  apk add --no-cache \
 	bash \
-	s6 \
-	s6-portable-utils \
 	tzdata && \
 
 apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/testing \
@@ -27,8 +28,8 @@ apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/testing \
 # add s6 overlay
  curl -o \
 	/tmp/s6-overlay.tar.gz -L \
-	https://github.com/just-containers/s6-overlay/releases/download/"${OVERLAY_VERSION}"/s6-overlay-nobin.tar.gz && \
-	tar xvfz /tmp/s6-overlay.tar.gz -C / && \
+	"${OVERLAY_WWW}" && \
+ tar xvfz /tmp/s6-overlay.tar.gz -C / && \
 
 # clean up
  apk del --purge \

From eae044a463e8c00d3593bf3c684f931e3bc47c7e Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Sat, 9 Jul 2016 11:16:27 +0100
Subject: [PATCH 2/2] fix formatting of Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8ad9076..8327cbf 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/testing \
 
 # add s6 overlay
  curl -o \
-	/tmp/s6-overlay.tar.gz -L \
+ /tmp/s6-overlay.tar.gz -L \
 	"${OVERLAY_WWW}" && \
  tar xvfz /tmp/s6-overlay.tar.gz -C / && \