Merge "docker.builder: introduce docker in docker feature" into dev
diff --git a/org.eclipse.om2m.docker.builder/Dockerfile b/org.eclipse.om2m.docker.builder/Dockerfile
index 0f73aa6..037e897 100644
--- a/org.eclipse.om2m.docker.builder/Dockerfile
+++ b/org.eclipse.om2m.docker.builder/Dockerfile
@@ -1,5 +1,16 @@
FROM maven:3-jdk-8
+# Install Docker from Docker Inc. repositories.
+RUN curl -sSL https://get.docker.com/ | sh
+ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
+RUN set -ex; \
+ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \
+ chmod +x /usr/local/bin/dind
+
+
+COPY dockerd-entrypoint.sh /usr/local/bin/
+
+VOLUME /var/lib/docker
# install android sdk
diff --git a/org.eclipse.om2m.docker.builder/dockerd-entrypoint.sh b/org.eclipse.om2m.docker.builder/dockerd-entrypoint.sh
new file mode 100644
index 0000000..a4cc3cd
--- /dev/null
+++ b/org.eclipse.om2m.docker.builder/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 \
+ "$@"
+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 "$@"
