commit 0a05aaa5f9d88b70abb0271dfc1dc08408d087f8
author Luca Milanesio <luca.milanesio@gmail.com> Sat Dec 17 18:34:13 2016 -0500
committer Luca Milanesio <luca.milanesio@gmail.com> Sat Dec 24 01:20:17 2016 +0000
tree 4f00cccc99a6e08ceca518d40749864927f13902
parent eac87c232a61dab07d950b153a8d358efcad9edb

Don't use TCP connection for local Docker

Avoid replacing the DOCKER_HOST env var
and instead just rely on the local socket
to connect to Docker

Change-Id: I316c5cecdf7c20259f26cdd1d1b3c019bab4b2d3

jenkins-docker/master/Dockerfile

diff --git a/jenkins-docker/master/Dockerfile b/jenkins-docker/master/Dockerfile
index e380560..1579d6e 100644
--- a/jenkins-docker/master/Dockerfile
+++ b/jenkins-docker/master/Dockerfile
@@ -40,7 +40,6 @@
 ENV OAUTH_SECRET secret
 ENV JENKINS_API_USER user
 ENV JENKINS_API_PASSWORD pass
-ENV DOCKER_HOST tcp://127.0.0.1:2375
 
 COPY edit-config.xslt $JENKINS_REF
 COPY config.xml $JENKINS_REF

jenkins-docker/master/config.sh

diff --git a/jenkins-docker/master/config.sh b/jenkins-docker/master/config.sh
index 7d6face..50ea8ae 100755
--- a/jenkins-docker/master/config.sh
+++ b/jenkins-docker/master/config.sh
@@ -15,7 +15,6 @@
   --stringparam use-security $USE_SECURITY \
   --stringparam oauth-client-id $OAUTH_ID \
   --stringparam oauth-client-secret $OAUTH_SECRET \
-  --stringparam docker-url $DOCKER_HOST \
   $JENKINS_REF/edit-config.xslt $CONFIG > /tmp/config.xml.new
 mv /tmp/config.xml.new $CONFIG