From 8d54531f2ff1653ef2b3986134d059524c01bf62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Darcel?= Date: Sun, 2 Feb 2020 22:08:17 -0600 Subject: [PATCH 1/3] Update to docker 19.03.05 --- docker/docker/Dockerfile.linux.amd64 | 2 +- docker/docker/Dockerfile.linux.arm | 2 +- docker/docker/Dockerfile.linux.arm64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index 08828af2..41df44ec 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,4 +1,4 @@ -FROM docker:18.09.0-dind +FROM docker:19.03.5-dind 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 64f7a5f4..815ad704 100644 --- a/docker/docker/Dockerfile.linux.arm +++ b/docker/docker/Dockerfile.linux.arm @@ -1,4 +1,4 @@ -FROM arm32v6/docker:18.09.0-dind +FROM arm32v6/docker:19.03.5-dind 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 08ab1d8b..ac4887ed 100644 --- a/docker/docker/Dockerfile.linux.arm64 +++ b/docker/docker/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/docker:18.09.0-dind +FROM arm64v8/docker:19.03.5-dind ADD release/linux/arm64/drone-docker /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"] 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 2/3] 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 e94250b6..b9bb1581 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 41df44ec..aa9924be 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 815ad704..0aacd503 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 ac4887ed..2b45b6ec 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"] From 23b5e6bcd90d014c9e3cc1ce63e9dd5efd0802e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Darcel?= Date: Sat, 2 May 2020 17:04:32 -0500 Subject: [PATCH 3/3] Update linux Dockerfile to 19.03.8 --- docker/docker/Dockerfile.linux.amd64 | 2 +- docker/docker/Dockerfile.linux.arm | 2 +- docker/docker/Dockerfile.linux.arm64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index aa9924be..c39c5787 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,4 +1,4 @@ -FROM docker:19.03.5-dind +FROM docker:19.03.8-dind ENV DOCKER_HOST=unix:///var/run/docker.sock diff --git a/docker/docker/Dockerfile.linux.arm b/docker/docker/Dockerfile.linux.arm index 0aacd503..1a8d8b3f 100644 --- a/docker/docker/Dockerfile.linux.arm +++ b/docker/docker/Dockerfile.linux.arm @@ -1,4 +1,4 @@ -FROM arm32v6/docker:19.03.5-dind +FROM arm32v6/docker:19.03.8-dind ENV DOCKER_HOST=unix:///var/run/docker.sock diff --git a/docker/docker/Dockerfile.linux.arm64 b/docker/docker/Dockerfile.linux.arm64 index 2b45b6ec..2a70c6a8 100644 --- a/docker/docker/Dockerfile.linux.arm64 +++ b/docker/docker/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/docker:19.03.5-dind +FROM arm64v8/docker:19.03.8-dind ENV DOCKER_HOST=unix:///var/run/docker.sock