From 4fee4925f260f408d79266d15e5e28a7bf0ae232 Mon Sep 17 00:00:00 2001 From: LaynePeng Date: Thu, 19 Feb 2015 14:49:13 +0800 Subject: [PATCH] #445-Fix Patch. Signed-off-by: LaynePeng --- host.go | 2 +- host_test.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/host.go b/host.go index a28fc68416..61537aed0a 100644 --- a/host.go +++ b/host.go @@ -246,7 +246,7 @@ DOCKER_TLS=no`, opts, caCertPath, serverKeyPath, serverCertPath) daemonOpts = fmt.Sprintf("--host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:%d", dockerPort) daemonOptsCfg = "/etc/default/docker" opts := fmt.Sprintf("%s %s", defaultDaemonOpts, daemonOpts) - daemonCfg = fmt.Sprintf("export DOCKER_OPTS='%s'", opts) + daemonCfg = fmt.Sprintf("export DOCKER_OPTS=\\\"%s\\\"", opts) } return &DockerConfig{ diff --git a/host_test.go b/host_test.go index 3b2fdcb81f..075a7411bb 100644 --- a/host_test.go +++ b/host_test.go @@ -211,6 +211,7 @@ func TestMachinePort(t *testing.T) { u := strings.Split(b, "=") url := u[1] url = strings.Replace(url, "'", "", -1) + url = strings.Replace(url, "\\\"", "", -1) if url != bindUrl { t.Errorf("expected url %s; received %s", bindUrl, url) } @@ -250,6 +251,7 @@ func TestMachineCustomPort(t *testing.T) { u := strings.Split(b, "=") url := u[1] url = strings.Replace(url, "'", "", -1) + url = strings.Replace(url, "\\\"", "", -1) if url != bindUrl { t.Errorf("expected url %s; received %s", bindUrl, url) }