Support weave script running against non-standard DOCKER_HOST #1689

paulbellamy · 2015-11-16T15:36:50Z

First part of fixing #1586.

Need to check it works with the plugin, and DOCKER_HOST=tcp://* as well. Any docker invocations I've missed, that need DOCKER_HOST passed in?

paulbellamy · 2015-11-16T16:28:08Z

Update: It doesn't work with the plugin, as the plugin is hard-coded to /var/run/docker.sock

paulbellamy · 2015-11-16T17:15:27Z

Does still work with DOCKER_HOST=tcp://*.

awh · 2015-11-30T10:41:04Z

Needs a rebase - another docker invocation got added to the makefile when the plugin codebase was merged in

awh · 2015-11-30T10:52:04Z

I was going to re-raise weaveworks-experiments/docker-plugin#47 in this repo as we've merged the code bases, but actually that doesn't make sense - the commit from that PR can be added to this one.

weave

@@ -1489,7 +1507,7 @@ launch_router() {
        --dns-effective-listen-address $DOCKER_BRIDGE_IP \
        ${NETHOST_OPT:+$DNS_ROUTER_OPTS} $NO_DNS_OPT \
        --http-addr $HTTP_IP:$HTTP_PORT \
-        --docker-api "unix:///var/run/docker.sock" "$@")
+        "$@")


paulbellamy · 2015-11-30T16:08:39Z

~~Also, needs the plugin changes, brought over here, since it moved.~~

awh · 2015-12-01T14:31:56Z

Looking good. Can we smoke test this? The vagrantfiles already cause the docker daemon in the test VMs to listen on TCP as well as the standard docker socket; presumably we can extend them to include a non-standard unix socket as well?

paulbellamy · 2015-12-01T14:36:36Z

Sure, but no guarantees it's actually using the non-standard socket.

Edit: Will add a test, though...

paulbellamy · 2015-12-02T17:04:50Z

This needs a "rebuild-with-ssh" on circle to debug why test 690 is hanging. Waiting for weaveworks/build-tools#10 to be deployed to fix a bug, for "rebuild-with-ssh" to work.

prog/plugin/main.go

+	if val := os.Getenv("DOCKER_HOST"); val != "" {
+		dockerSocket = val
+	}
+	dockerClient, err := docker.NewClient(dockerSocket)


test/650_proxy_env_test.sh

@@ -31,7 +31,7 @@ check
 # Check we can use weave env/config with unix -Hs specified
 weave_on $HOST1 stop
 weave_on $HOST1 launch-proxy -H unix:///var/run/weave/weave.sock
-assert_raises "run_on $HOST1 'eval \$(weave env) ; docker $CMD'"
-assert_raises "run_on $HOST1 'docker \$(weave config) $CMD'"


…roxy

Means we need to rebuild the gce images (also small improvement re tmpdir)

- proxy copies permissions from $DOCKER_HOST socket if available, so in this case it was not accessible because we were booting via a TCP socket

Support weave script running against non-standard DOCKER_HOST.

paulbellamy force-pushed the 1586-alternate-docker-sock branch from 195fcac to 1401100 Compare November 16, 2015 17:31

paulbellamy mentioned this pull request Nov 17, 2015

Support weave script running against non-standard docker unix sockets. weaveworks-experiments/docker-plugin#47

Closed

paulbellamy changed the title ~~[WIP] Support weave script running against non-standard docker unix sockets.~~ Support weave script running against non-standard docker unix sockets. Nov 17, 2015

paulbellamy force-pushed the 1586-alternate-docker-sock branch from 1401100 to dc2d794 Compare November 20, 2015 11:35

awh added this to the 1.4.0 milestone Nov 20, 2015

awh self-assigned this Nov 20, 2015

awh reviewed Nov 30, 2015
View reviewed changes

awh assigned paulbellamy and unassigned awh Nov 30, 2015

paulbellamy force-pushed the 1586-alternate-docker-sock branch from 7860eaa to 3081a73 Compare November 30, 2015 16:25

paulbellamy assigned awh and unassigned paulbellamy Nov 30, 2015

awh changed the title ~~Support weave script running against non-standard docker unix sockets.~~ Support weave script running against non-standard DOCKER_HOST Dec 1, 2015

awh assigned paulbellamy and unassigned awh Dec 1, 2015

paulbellamy force-pushed the 1586-alternate-docker-sock branch 2 times, most recently from 67d298e to 9f6d892 Compare December 2, 2015 11:58

rade force-pushed the master branch from 1f438db to 2cfaf5a Compare December 2, 2015 14:23

awh force-pushed the master branch from 2cfaf5a to 1f438db Compare December 2, 2015 14:32

paulbellamy force-pushed the 1586-alternate-docker-sock branch from 9f6d892 to da75848 Compare December 2, 2015 15:35

paulbellamy force-pushed the 1586-alternate-docker-sock branch from da75848 to 50b8d1e Compare December 8, 2015 10:38

bboreham force-pushed the 1586-alternate-docker-sock branch from 50b8d1e to 4fc22a2 Compare December 14, 2015 14:59

bboreham reviewed Dec 14, 2015
View reviewed changes

prog/plugin/main.go

if val := os.Getenv("DOCKER_HOST"); val != "" {

dockerSocket = val

}

dockerClient, err := docker.NewClient(dockerSocket)

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

paulbellamy removed their assignment Dec 14, 2015

bboreham force-pushed the 1586-alternate-docker-sock branch 2 times, most recently from 07a790a to 7c2b210 Compare December 14, 2015 20:51

bboreham assigned paulbellamy Dec 15, 2015

paulbellamy reviewed Dec 15, 2015
View reviewed changes

paulbellamy force-pushed the 1586-alternate-docker-sock branch from 7c2b210 to b6c420b Compare December 15, 2015 10:42

paulbellamy assigned bboreham and unassigned paulbellamy Dec 15, 2015

paulbellamy force-pushed the 1586-alternate-docker-sock branch from b6c420b to 6515fe4 Compare December 15, 2015 12:57

bboreham force-pushed the 1586-alternate-docker-sock branch 2 times, most recently from cd7f937 to fb74d0a Compare December 15, 2015 16:07

paulbellamy added 4 commits December 15, 2015 18:02

Makefile should use DOCKER_HOST env var

ca1cce3

First pass at passing DOCKER_HOST=unix://* through to the weave and p…

0afc3db

…roxy

make weave and the proxy work with tcp-only dockers via DOCKER_HOST

f28ad35

support alternate DOCKER_HOST settings when launching the plugin

a4ef966

bboreham force-pushed the 1586-alternate-docker-sock branch from fb74d0a to 125e9ce Compare December 15, 2015 18:12

paulbellamy and others added 2 commits December 16, 2015 10:14

add test for proxy against docker on non-standard unix socket

88fad25

Means we need to rebuild the gce images (also small improvement re tmpdir)

Launch the proxy via unix socket in last test

d8cfbc4

- proxy copies permissions from $DOCKER_HOST socket if available, so in this case it was not accessible because we were booting via a TCP socket

bboreham force-pushed the 1586-alternate-docker-sock branch from 125e9ce to d8cfbc4 Compare December 16, 2015 10:15

bboreham added a commit that referenced this pull request Dec 16, 2015

Merge pull request #1689 from weaveworks/1586-alternate-docker-sock

85c9cf4

Support weave script running against non-standard DOCKER_HOST.

bboreham merged commit 85c9cf4 into master Dec 16, 2015

paulbellamy deleted the 1586-alternate-docker-sock branch December 16, 2015 10:39

bboreham mentioned this pull request Dec 16, 2015

work with dockers on domain sockets other than unix:///var/run/docker #1586

Closed

rade mentioned this pull request Dec 22, 2015

weave launch breaks when docker client connects over TLS #1820

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support weave script running against non-standard DOCKER_HOST #1689

Support weave script running against non-standard DOCKER_HOST #1689

paulbellamy commented Nov 16, 2015

paulbellamy commented Nov 16, 2015

paulbellamy commented Nov 16, 2015

awh commented Nov 30, 2015

awh commented Nov 30, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

paulbellamy commented Nov 30, 2015

awh commented Dec 1, 2015

paulbellamy commented Dec 1, 2015

paulbellamy commented Dec 2, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

Support weave script running against non-standard DOCKER_HOST #1689

Support weave script running against non-standard DOCKER_HOST #1689

Conversation

paulbellamy commented Nov 16, 2015

paulbellamy commented Nov 16, 2015

paulbellamy commented Nov 16, 2015

awh commented Nov 30, 2015

awh commented Nov 30, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

paulbellamy commented Nov 30, 2015

awh commented Dec 1, 2015

paulbellamy commented Dec 1, 2015

paulbellamy commented Dec 2, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.