From bf367be3b6ccd9b415482b811792ece2d475b1cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Milenkovi=C4=87?=
 <milenkovicm@users.noreply.github.com>
Date: Fri, 10 Jun 2016 22:36:04 +0100
Subject: [PATCH 1/2] update container to latest libraries

Update container to latest glibc libraries and update parent docker
image to 1.11.2-dind
---
 Dockerfile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0432cb6..cc016bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM docker:1.11-dind
+FROM docker:1.11.2-dind
 
 MAINTAINER Mesosphere Support <support+jenkins-dind@mesosphere.com>
 
 # http://bugs.python.org/issue19846
 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
 ENV ALPINE_EDGE_COMMUNITY_REPO=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    ALPINE_GLIBC_BASE_URL=https://github.com/andyshinn/alpine-pkg-glibc/releases/download/unreleased \
-    ALPINE_GLIBC_PACKAGE=glibc-2.23-r1.apk \
-    ALPINE_GLIBC_BIN_PACKAGE=glibc-bin-2.23-r1.apk \
-    ALPINE_GLIBC_I18N_PACKAGE=glibc-i18n-2.23-r1.apk \
-    ANDY_SHINN_RSA_PUB_URL=https://raw.githubusercontent.com/andyshinn/alpine-pkg-glibc/master/andyshinn.rsa.pub \
+    ALPINE_GLIBC_BASE_URL=https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r2 \
+    ALPINE_GLIBC_PACKAGE=glibc-2.23-r2.apk \
+    ALPINE_GLIBC_BIN_PACKAGE=glibc-bin-2.23-r2.apk \
+    ALPINE_GLIBC_I18N_PACKAGE=glibc-i18n-2.23-r2.apk \
+    ALPINE_GLIBC_RSA_PUB_URL=https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r2/sgerrand.rsa.pub \
     JAVA_HOME=/usr/lib/jvm/default-jvm \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8 \
@@ -39,8 +39,12 @@ RUN apk --update add \
     tar \
     unzip \
     && cd /tmp \
+    && pip install --upgrade \
+    pip \
+    setuptools \
+    virtualenv \
     && apk add --update --repository ${ALPINE_EDGE_COMMUNITY_REPO} tini \
-    && wget -q -O /etc/apk/keys/andyshinn.rsa.pub "${ANDY_SHINN_RSA_PUB_URL}" \
+    && wget -q -O /etc/apk/keys/sgerrand.rsa.pub "${ALPINE_GLIBC_RSA_PUB_URL}" \
     && wget -q "${ALPINE_GLIBC_BASE_URL}/${ALPINE_GLIBC_PACKAGE}" \
                "${ALPINE_GLIBC_BASE_URL}/${ALPINE_GLIBC_BIN_PACKAGE}" \
                "${ALPINE_GLIBC_BASE_URL}/${ALPINE_GLIBC_I18N_PACKAGE}" \

From c84230b018c9657be9311ea7096bfd833913c074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Milenkovi=C4=87?=
 <milenkovicm@users.noreply.github.com>
Date: Fri, 10 Jun 2016 22:38:28 +0100
Subject: [PATCH 2/2] add way to provide extra opts for docker deamon

In some cases extra options are needed when starting docker daemon,
line insecure registry or so. environment variable DOCKER_EXTRA_OPTS
provides should be used to introduce extra options for docker deamon
---
 wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wrapper.sh b/wrapper.sh
index bda6d32..f84745a 100755
--- a/wrapper.sh
+++ b/wrapper.sh
@@ -2,7 +2,7 @@
 set -e
 
 echo "==> Launching the Docker daemon..."
-dind docker daemon --host=unix:///var/run/docker.sock --storage-driver=overlay &
+dind docker daemon --host=unix:///var/run/docker.sock --storage-driver=overlay $DOCKER_EXTRA_OPTS &
 
 while(! docker info > /dev/null 2>&1); do
     echo "==> Waiting for the Docker daemon to come online..."