From ae4d5c759ff91a03bd17febf4222d400725ee61c Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Fri, 6 Sep 2013 19:03:29 -0700 Subject: [PATCH] Adapt the original dind script and add a description Upstream-commit: 3c80bd76cf6aa8f6918439f8082b0a8c34fd2c0e Component: engine --- components/engine/hack/dind | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/components/engine/hack/dind b/components/engine/hack/dind index 5d606ed42f..f9a654670b 100644 --- a/components/engine/hack/dind +++ b/components/engine/hack/dind @@ -1,5 +1,14 @@ #!/bin/bash +# DinD: a wrapper script which allows docker to be run inside a docker container. +# Original version by Jerome Petazzoni +# See the blog post: http://blog.docker.io/2013/09/docker-can-now-run-within-docker/ +# +# This script should be executed inside a docker container in privilieged mode +# ('docker run -privileged', introduced in docker 0.6). + +# Usage: dind CMD [ARG...] + # First, make sure that cgroups are mounted correctly. CGROUP=/sys/fs/cgroup @@ -44,13 +53,4 @@ do done popd -# If we were given a PORT environment variable, start as a simple daemon; -# otherwise, spawn a shell as well -if [ "$PORT" ] -then - exec docker -d -H 0.0.0.0:$PORT -else - - docker -d & - exec bash -fi +exec $*