docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Merge pull request #559 from LaynePeng/master

Browse Source 
#445-Fix Patch.
This commit is contained in:
Evan Hazlett
2015-02-20 13:06:28 -08:00
parent 70552f73bd 4fee4925f2
commit 9ea86711ef
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
host.go
View File

@@ -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{

2
host_test.go
View File

@@ -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)
}