Merge pull request #43 from infosiftr/new-rc

Add 17.03-rc

Author: yosifkit

.travis.yml

@@ -2,6 +2,7 @@ language: bash
 services: docker
 
 env:
+  - VERSION=17.03-rc VARIANT=
   - VERSION=1.13 VARIANT=
   - VERSION=1.12 VARIANT=
   - VERSION=1.12 VARIANT=experimental

17.03-rc/Dockerfile

@@ -0,0 +1,24 @@
+FROM alpine:3.5
+
+RUN apk add --no-cache \
+		ca-certificates \
+		curl \
+		openssl
+
+ENV DOCKER_BUCKET test.docker.com
+ENV DOCKER_VERSION 17.03.0-ce-rc1
+ENV DOCKER_SHA256 4ba6482ff22ddfcf31019c831c8363f309c2c3cf8046d54b53a07e10edf19e47
+
+RUN set -x \
+	&& curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
+	&& echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \
+	&& tar -xzvf docker.tgz \
+	&& mv docker/* /usr/local/bin/ \
+	&& rmdir docker \
+	&& rm docker.tgz \
+	&& docker -v
+
+COPY docker-entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+CMD ["sh"]

17.03-rc/dind/Dockerfile

@@ -0,0 +1,32 @@
+FROM docker:17.03-rc
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+RUN apk add --no-cache \
+		btrfs-progs \
+		e2fsprogs \
+		e2fsprogs-extra \
+		iptables \
+		xfsprogs \
+		xz
+
+# TODO aufs-tools
+
+# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
+RUN set -x \
+	&& addgroup -S dockremap \
+	&& adduser -S -G dockremap dockremap \
+	&& echo 'dockremap:165536:65536' >> /etc/subuid \
+	&& echo 'dockremap:165536:65536' >> /etc/subgid
+
+ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+
+RUN wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \
+	&& chmod +x /usr/local/bin/dind
+
+COPY dockerd-entrypoint.sh /usr/local/bin/
+
+VOLUME /var/lib/docker
+EXPOSE 2375
+
+ENTRYPOINT ["dockerd-entrypoint.sh"]
+CMD []

17.03-rc/dind/dockerd-entrypoint.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+# no arguments passed
+# or first arg is `-f` or `--some-option`
+if [ "$#" -eq 0 -o "${1#-}" != "$1" ]; then
+	# add our default arguments
+	set -- dockerd \
+		--host=unix:///var/run/docker.sock \
+		--host=tcp://0.0.0.0:2375 \
+		--storage-driver=vfs \
+		"$@"
+fi
+
+if [ "$1" = 'dockerd' ]; then
+	# if we're running Docker, let's pipe through dind
+	# (and we'll run dind explicitly with "sh" since its shebang is /bin/bash)
+	set -- sh "$(which dind)" "$@"
+fi
+
+exec "$@"

17.03-rc/docker-entrypoint.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- docker "$@"
+fi
+
+# if our command is a valid Docker subcommand, let's invoke it through Docker instead
+# (this allows for "docker run docker ps", etc)
+if docker help "$1" > /dev/null 2>&1; then
+	set -- docker "$@"
+fi
+
+# if we have "--link some-docker:docker" and not DOCKER_HOST, let's set DOCKER_HOST automatically
+if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then
+	export DOCKER_HOST='tcp://docker:2375'
+fi
+
+exec "$@"

17.03-rc/git/Dockerfile

@@ -0,0 +1,5 @@
+FROM docker:17.03-rc
+
+RUN apk add --no-cache \
+		git \
+		openssh-client

generate-stackbrew-library.sh

@@ -3,7 +3,7 @@ set -eu
 
 declare -A aliases=(
 	[1.13]='1 latest'
-	[1.14-rc]='rc'
+	[17.03-rc]='rc'
 )
 
 self="$(basename "$BASH_SOURCE")"