Merge branch 'ha-feature-trusty' of github.com:travis-ci/travis-cookb…

…ooks into ha-feature-trusty
travis-ci · Mar 13, 2015 · 707831c · 707831c
2 parents eb14bc3 + ecdb9ca
commit 707831c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ci_environment/docker/files/default/etc/default/docker b/ci_environment/docker/files/default/etc/default/docker
@@ -1 +1,2 @@
-DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock -g=/mnt/docker"
+# we keep "-H tcp://..." for API clients that can't to talk to UNIX sockets
+DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"