From b81713203f68b0be14c55dcddf82af3367652526 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 13 Jun 2017 12:39:02 -0700 Subject: [PATCH] Add a little "paperclip" suggestion when attempting to run "dockerd" in the non-dind image variants --- 17.03-rc/docker-entrypoint.sh | 15 +++++++++++++++ 17.03/docker-entrypoint.sh | 15 +++++++++++++++ 17.05/docker-entrypoint.sh | 15 +++++++++++++++ 17.06-rc/docker-entrypoint.sh | 15 +++++++++++++++ docker-entrypoint.sh | 15 +++++++++++++++ 5 files changed, 75 insertions(+) diff --git a/17.03-rc/docker-entrypoint.sh b/17.03-rc/docker-entrypoint.sh index fe790b143..848a4ad5f 100755 --- a/17.03-rc/docker-entrypoint.sh +++ b/17.03-rc/docker-entrypoint.sh @@ -17,4 +17,19 @@ if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then export DOCKER_HOST='tcp://docker:2375' fi +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-overlay-docker -d docker:stable-dind --storage-driver=overlay + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + exec "$@" diff --git a/17.03/docker-entrypoint.sh b/17.03/docker-entrypoint.sh index fe790b143..848a4ad5f 100755 --- a/17.03/docker-entrypoint.sh +++ b/17.03/docker-entrypoint.sh @@ -17,4 +17,19 @@ if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then export DOCKER_HOST='tcp://docker:2375' fi +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-overlay-docker -d docker:stable-dind --storage-driver=overlay + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + exec "$@" diff --git a/17.05/docker-entrypoint.sh b/17.05/docker-entrypoint.sh index fe790b143..848a4ad5f 100755 --- a/17.05/docker-entrypoint.sh +++ b/17.05/docker-entrypoint.sh @@ -17,4 +17,19 @@ if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then export DOCKER_HOST='tcp://docker:2375' fi +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-overlay-docker -d docker:stable-dind --storage-driver=overlay + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + exec "$@" diff --git a/17.06-rc/docker-entrypoint.sh b/17.06-rc/docker-entrypoint.sh index fe790b143..848a4ad5f 100755 --- a/17.06-rc/docker-entrypoint.sh +++ b/17.06-rc/docker-entrypoint.sh @@ -17,4 +17,19 @@ if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then export DOCKER_HOST='tcp://docker:2375' fi +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-overlay-docker -d docker:stable-dind --storage-driver=overlay + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + exec "$@" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index fe790b143..848a4ad5f 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -17,4 +17,19 @@ if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then export DOCKER_HOST='tcp://docker:2375' fi +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-overlay-docker -d docker:stable-dind --storage-driver=overlay + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + exec "$@"