Merge pull request #110 from infosiftr/latest-dind

Finally update "dind" wrapper to the latest commit

Author: tianon

17.12/dind/Dockerfile

@@ -26,7 +26,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT 52379fa76dee07ca038624d639d9e14f4fb719ff
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \

18.03/dind/Dockerfile

@@ -28,7 +28,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT 52379fa76dee07ca038624d639d9e14f4fb719ff
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \

18.04/dind/Dockerfile

@@ -28,7 +28,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT 52379fa76dee07ca038624d639d9e14f4fb719ff
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \

18.05-rc/dind/Dockerfile

@@ -28,7 +28,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT 52379fa76dee07ca038624d639d9e14f4fb719ff
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \

Dockerfile-dind.template

@@ -28,7 +28,8 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+# https://github.com/docker/docker/tree/master/hack/dind
+ENV DIND_COMMIT %%DIND-COMMIT%%
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps libressl; \

update.sh

@@ -27,9 +27,6 @@ sed_escape_rhs() {
 # "tac|tac" for http://stackoverflow.com/a/28879552/433558
 dindLatest="$(curl -fsSL 'https://github.com/docker/docker/commits/master/hack/dind.atom' | tac|tac | awk -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')"
 
-# TODO once "Supported Docker versions" minimums at Docker 1.8+ (1.6 at time of this writing), bring this back again
-#sed -r -e 's/^(ENV DIND_COMMIT) .*/\1 '"$dindLatest"'/' Dockerfile-dind.template
-
 dockerVersions="$(
 	{
 		git ls-remote --tags https://github.com/docker/docker-ce.git
@@ -94,6 +91,7 @@ for version in "${versions[@]}"; do
 			-e 's!%%DOCKER-CHANNEL%%!'"$channel"'!g' \
 			-e 's!%%DOCKER-VERSION%%!'"$fullVersion"'!g' \
 			-e 's!%%TAG%%!'"$tag"'!g' \
+			-e 's!%%DIND-COMMIT%%!'"$dindLatest"'!g' \
 			-e 's!%%ARCH-CASE%%!'"$(sed_escape_rhs "$archCase")"'!g' \
 			"$template" > "$df"