From 9e3612fb18e30261da46bea13e059d80b51a414d Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Wed, 26 Oct 2016 08:43:13 -0300 Subject: [PATCH] Mount the docker socket in the default path for dind --- tools/dind/config/services/resin-supervisor-dind.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/dind/config/services/resin-supervisor-dind.service b/tools/dind/config/services/resin-supervisor-dind.service index 98e3df57..b6520a37 100644 --- a/tools/dind/config/services/resin-supervisor-dind.service +++ b/tools/dind/config/services/resin-supervisor-dind.service @@ -16,7 +16,7 @@ ExecStartPre=-/bin/touch /etc/resolv.conf ExecStart=/bin/bash -c 'source /usr/src/app/resin-vars && \ /usr/bin/docker run --rm --privileged --name resin_supervisor \ --net=host \ - -v /var/run/docker.sock:/run/docker.sock \ + -v /var/run/docker.sock:/var/run/docker.sock \ -v "${CONFIG_PATH}:/boot/config.json" \ -v "${APPS_PATH}:/boot/apps.json" \ -v /resin-data/resin-supervisor:/data \ @@ -36,6 +36,7 @@ ExecStart=/bin/bash -c 'source /usr/src/app/resin-vars && \ -e "DBUS_SYSTEM_BUS_ADDRESS=unix:path=/mnt/root/run/dbus/system_bus_socket" \ -e "RESIN_SUPERVISOR_SECRET=${RESIN_SUPERVISOR_SECRET}" \ -e "DOCKER_ROOT=/mnt/root/var/lib/docker" \ + -e "DOCKER_SOCKET=/var/run/docker.sock" \ ${SUPERVISOR_IMAGE}' TimeoutStartSec=0 Restart=always