From 56e470dcdae3581e4396f55411d634f76dd137ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Darcel?= Date: Sun, 2 Feb 2020 22:09:22 -0600 Subject: [PATCH] Start daemon with Unix socket only Mostly reproduce flow of https://github.com/docker-library/docker/blob/master/19.03/dind/dockerd-entrypoint.sh#L130 TCP socket with or without TLS isn't really needed for our usecase so it's disable --- docker.go | 5 ++++- docker/docker/Dockerfile.linux.amd64 | 2 ++ docker/docker/Dockerfile.linux.arm | 2 ++ docker/docker/Dockerfile.linux.arm64 | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docker.go b/docker.go index e94250b..b9bb158 100644 --- a/docker.go +++ b/docker.go @@ -330,7 +330,10 @@ func commandPush(build Build, tag string) *exec.Cmd { // helper function to create the docker daemon command. func commandDaemon(daemon Daemon) *exec.Cmd { - args := []string{"--data-root", daemon.StoragePath} + args := []string{ + "--data-root", daemon.StoragePath, + "--host=unix:///var/run/docker.sock", + } if daemon.StorageDriver != "" { args = append(args, "-s", daemon.StorageDriver) diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index 41df44e..aa9924b 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,4 +1,6 @@ FROM docker:19.03.5-dind +ENV DOCKER_HOST=unix:///var/run/docker.sock + ADD release/linux/amd64/drone-docker /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"] diff --git a/docker/docker/Dockerfile.linux.arm b/docker/docker/Dockerfile.linux.arm index 815ad70..0aacd50 100644 --- a/docker/docker/Dockerfile.linux.arm +++ b/docker/docker/Dockerfile.linux.arm @@ -1,4 +1,6 @@ FROM arm32v6/docker:19.03.5-dind +ENV DOCKER_HOST=unix:///var/run/docker.sock + ADD release/linux/arm/drone-docker /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"] diff --git a/docker/docker/Dockerfile.linux.arm64 b/docker/docker/Dockerfile.linux.arm64 index ac4887e..2b45b6e 100644 --- a/docker/docker/Dockerfile.linux.arm64 +++ b/docker/docker/Dockerfile.linux.arm64 @@ -1,4 +1,6 @@ FROM arm64v8/docker:19.03.5-dind +ENV DOCKER_HOST=unix:///var/run/docker.sock + ADD release/linux/arm64/drone-docker /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"]