Fixed up build and updated dependencies.

images/dind/Dockerfile

@@ -0,0 +1,26 @@
+# Copyright 2016 Iron.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+FROM docker:1.13.1-dind
+
+RUN apk update && apk upgrade && apk add --no-cache ca-certificates
+
+COPY entrypoint.sh /usr/local/bin/
+COPY dind.sh /usr/local/bin/
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+# USAGE: Add a CMD to your own Dockerfile to use this (NOT an ENTRYPOINT, so that this is called)
+# CMD ["./runner"]

images/dind/README.md

@@ -0,0 +1,2 @@
+This is the base image for all Titan's docker-in-docker images. 
+

images/dind/VERSION

@@ -0,0 +1 @@
+0.1.2

images/dind/build.sh

@@ -0,0 +1,19 @@
+
+# Copyright 2016 Iron.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+set -ex
+
+docker build -t treeder/dind:latest .

images/dind/chaos/Dockerfile

@@ -0,0 +1,27 @@
+# Copyright 2016 Iron.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# iron/dind-chaos
+FROM docker:1.12-rc-dind
+
+RUN apk update && apk upgrade && apk add --no-cache ca-certificates
+
+COPY entrypoint.sh /usr/local/bin/
+COPY chaos.sh /usr/local/bin/
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+# USAGE: Add a CMD to your own Dockerfile to use this (NOT an ENTRYPOINT, so that this is called)
+# CMD ["./runner"]

images/dind/chaos/README.md

@@ -0,0 +1 @@
+dind docker to periodically kill docker to test against

images/dind/chaos/chaos.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Copyright 2016 Iron.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+sleep 600 # 10 minutes
+
+for i in 1..1000; do
+  pkill -9 dockerd
+  pkill -9 docker-containerd
+  # remove pid file since we killed docker hard
+  rm /var/run/docker.pid
+  sleep 30
+  docker daemon \
+      --host=unix:///var/run/docker.sock \
+      --host=tcp://0.0.0.0:2375 &
+  sleep 300 # 5 minutes
+done

images/dind/chaos/entrypoint.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Copyright 2016 Iron.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+set -ex
+
+# modified from: https://github.com/docker-library/docker/blob/866c3fbd87e8eeed524fdf19ba2d63288ad49cd2/1.11/dind/dockerd-entrypoint.sh
+# this will run either overlay or aufs as the docker fs driver, if the OS has both, overlay is preferred.
+
+docker daemon \
+		--host=unix:///var/run/docker.sock \
+		--host=tcp://0.0.0.0:2375 &
+
+# wait for daemon to initialize
+sleep 10
+
+/usr/local/bin/chaos.sh &
+
+exec "$@"

images/dind/dind.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Copyright 2016 Iron.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+# modified from: https://github.com/docker-library/docker/blob/866c3fbd87e8eeed524fdf19ba2d63288ad49cd2/1.11/dind/dockerd-entrypoint.sh
+# this will run either overlay or aufs as the docker fs driver, if the OS has both, overlay is preferred.
+# rewrite overlay to use overlay2 (docker 1.12, linux >=4.x required), see https://docs.docker.com/engine/userguide/storagedriver/selectadriver/#overlay-vs-overlay2
+
+fsdriver=$(grep -Eh -w -m1 "overlay|aufs" /proc/filesystems | cut -f2)
+
+if [ $fsdriver == "overlay" ]; then
+  fsdriver="overlay2"
+fi
+
+cmd="dockerd \
+		--host=unix:///var/run/docker.sock \
+		--host=tcp://0.0.0.0:2375 \
+		--storage-driver=$fsdriver"
+
+# nanny and restart on crashes
+until eval $cmd; do
+  echo "Docker crashed with exit code $?.  Respawning.." >&2
+  # if we just restart it won't work, so start it (it wedges up) and
+  # then kill the wedgie and restart it again and ta da... yea, seriously
+  pidfile=/var/run/docker/libcontainerd/docker-containerd.pid
+  kill -9 $(cat $pidfile)
+  rm $pidfile
+  sleep 1
+done

images/dind/entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Copyright 2016 Iron.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+/usr/local/bin/dind.sh &
+
+# wait for daemon to initialize
+sleep 3
+
+exec "$@"

images/dind/release.sh

@@ -0,0 +1,26 @@
+# Copyright 2016 Iron.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+./build.sh
+
+docker run --rm -v "$PWD":/app treeder/bump patch
+version=`cat VERSION`
+echo "version $version"
+
+docker tag treeder/dind:latest treeder/dind:$version
+
+docker push treeder/dind:latest
+docker push treeder/dind:$version