Skip to content

add DOCKER_HOST as a build-arg #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

add DOCKER_HOST as a build-arg #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions 18.06/dind/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker:18.06

ARG DOCKER_HOST
ENV DOCKER_HOST=$DOCKER_HOST

# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN set -eux; \
apk add --no-cache \
Expand Down
4 changes: 3 additions & 1 deletion 18.06/dind/dockerd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/bin/sh
set -e

DOCKER_HOST=${DOCKER_HOST:-tcp://0.0.0.0:2375}

# no arguments passed
# or first arg is `-f` or `--some-option`
if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
# add our default arguments
set -- dockerd \
--host=unix:///var/run/docker.sock \
--host=tcp://0.0.0.0:2375 \
--host="${DOCKER_HOST}" \
"$@"
fi

Expand Down
3 changes: 3 additions & 0 deletions 18.09-rc/dind/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker:18.09-rc

ARG DOCKER_HOST
ENV DOCKER_HOST=$DOCKER_HOST

# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN set -eux; \
apk add --no-cache \
Expand Down
4 changes: 3 additions & 1 deletion 18.09-rc/dind/dockerd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/bin/sh
set -e

DOCKER_HOST=${DOCKER_HOST:-tcp://0.0.0.0:2375}

# no arguments passed
# or first arg is `-f` or `--some-option`
if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
# add our default arguments
set -- dockerd \
--host=unix:///var/run/docker.sock \
--host=tcp://0.0.0.0:2375 \
--host="${DOCKER_HOST}" \
"$@"
fi

Expand Down
3 changes: 3 additions & 0 deletions 18.09/dind/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker:18.09

ARG DOCKER_HOST
ENV DOCKER_HOST=$DOCKER_HOST

# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN set -eux; \
apk add --no-cache \
Expand Down
4 changes: 3 additions & 1 deletion 18.09/dind/dockerd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/bin/sh
set -e

DOCKER_HOST=${DOCKER_HOST:-tcp://0.0.0.0:2375}

# no arguments passed
# or first arg is `-f` or `--some-option`
if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
# add our default arguments
set -- dockerd \
--host=unix:///var/run/docker.sock \
--host=tcp://0.0.0.0:2375 \
--host="${DOCKER_HOST}" \
"$@"
fi

Expand Down
3 changes: 3 additions & 0 deletions 19.03-rc/dind/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker:19.03-rc

ARG DOCKER_HOST
ENV DOCKER_HOST=$DOCKER_HOST

# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN set -eux; \
apk add --no-cache \
Expand Down
4 changes: 3 additions & 1 deletion 19.03-rc/dind/dockerd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/bin/sh
set -e

DOCKER_HOST=${DOCKER_HOST:-tcp://0.0.0.0:2375}

# no arguments passed
# or first arg is `-f` or `--some-option`
if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
# add our default arguments
set -- dockerd \
--host=unix:///var/run/docker.sock \
--host=tcp://0.0.0.0:2375 \
--host="${DOCKER_HOST}" \
"$@"
fi

Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-dind.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker:%%VERSION%%

ARG DOCKER_HOST
ENV DOCKER_HOST=$DOCKER_HOST

# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN set -eux; \
apk add --no-cache \
Expand Down
4 changes: 3 additions & 1 deletion dockerd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/bin/sh
set -e

DOCKER_HOST=${DOCKER_HOST:-tcp://0.0.0.0:2375}

# no arguments passed
# or first arg is `-f` or `--some-option`
if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
# add our default arguments
set -- dockerd \
--host=unix:///var/run/docker.sock \
--host=tcp://0.0.0.0:2375 \
--host="${DOCKER_HOST}" \
"$@"
fi

Expand Down