commit 65235ca34108d6ce3e702e813c0b01030386f7b9
author Han-Wen Nienhuys <hanwen@google.com> Mon Mar 11 16:45:26 2019 +0100
committer Han-Wen Nienhuys <hanwen@google.com> Mon Mar 11 16:52:09 2019 +0100
tree a371406fc8a946ff54037c0588c4155e8b6d62ec
parent 8a6028a4289fb21982818d838e908c63783c18d7

Put local docker config in /etc/docker/daemon.json

Change-Id: I87cde28f2b66b896176cf9ec1c124d837e91a99f

worker/daemon.json

diff --git a/worker/daemon.json b/worker/daemon.json
new file mode 100644
index 0000000..4a77f1e
--- /dev/null
+++ b/worker/daemon.json
@@ -0,0 +1,3 @@
+{
+  "hosts": ["unix:///var/run/docker.sock", "tcp://0.0.0.0:2375"]
+}

worker/setup.sh

diff --git a/worker/setup.sh b/worker/setup.sh
index 90eda2c..5e8ab93 100755
--- a/worker/setup.sh
+++ b/worker/setup.sh
@@ -15,16 +15,12 @@
     echo '[gerrit-ci.gerritforge.com]:1022,[8.26.94.23]:1022 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUylKwtTDROpPce/sCfdMMR+N116TsZx5n4YHO8qPLaEhEXld+1T+hWe/HuITafW182hTnOjMHlK/GwH9A7KOS9XHHdBtHCYx0lH78kb+fvZsUtyuGlbQNXzQuyBIpJoYOtMRhn5aHR1sn1USHnnZp1V1dpDu/HYHjpj4pyA8I4i2BE89OVblxyggdulvgLfaLFJ+6Q9U+Mf+SHpufgsXDNlG/KTQVHioONoOnu47qbhJLSK+w5Q3dzaLa2CTPCZgdOFf3g6AQJWMKDEkTnReT9bR97lg1T59GoK2pLpem1gokiUQ052/qH/cL/b38XtW/IJCK9HmrV5Whc26dDg95' >> .ssh/known_hosts
 fi
 
-# Docker on port 2375
-if ! grep --quiet 2375 /lib/systemd/system/docker.service; then
-  sed -i 's|$OPTIONS|$OPTIONS -H unix:///var/run/docker.sock -H tcp://0.0.0.0:2375|' /lib/systemd/system/docker.service
-fi
-
 if ! grep --quiet net.ipv4.ip_forward=1 /etc/sysctl.conf; then
     echo 'net.ipv4.ip_forward=1' >> /etc/sysctl.conf
     sysctl net.ipv4.ip_forward=1
 fi
 
+cp ${src}/daemon.json /etc/docker/
 cp ${src}/setup-tunnel.service /etc/systemd/system/
 cp ${src}/tunnel.sh /root