зеркало из https://github.com/microsoft/docker.git
Remove DOCKER_HTTP_HOST_COMPAT env var
Signed-off-by: Darren Shepherd <darren@rancher.com>
This commit is contained in:
Родитель
e3079b4704
Коммит
989f6f852f
|
@ -114,14 +114,12 @@ func notifyShutdown(err error) {
|
|||
}
|
||||
|
||||
func wrapListeners(proto string, ls []net.Listener) []net.Listener {
|
||||
if os.Getenv("DOCKER_HTTP_HOST_COMPAT") != "" {
|
||||
switch proto {
|
||||
case "unix":
|
||||
ls[0] = &hack.MalformedHostHeaderOverride{ls[0]}
|
||||
case "fd":
|
||||
for i := range ls {
|
||||
ls[i] = &hack.MalformedHostHeaderOverride{ls[i]}
|
||||
}
|
||||
switch proto {
|
||||
case "unix":
|
||||
ls[0] = &hack.MalformedHostHeaderOverride{ls[0]}
|
||||
case "fd":
|
||||
for i := range ls {
|
||||
ls[i] = &hack.MalformedHostHeaderOverride{ls[i]}
|
||||
}
|
||||
}
|
||||
return ls
|
||||
|
|
|
@ -849,20 +849,6 @@ set like this:
|
|||
export DOCKER_TMPDIR=/mnt/disk2/tmp
|
||||
/usr/local/bin/dockerd -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1
|
||||
|
||||
Docker clients <= 1.9.2 used an invalid Host header when making request to the
|
||||
daemon. Docker 1.12 is built using golang 1.6 which is now checking the validity
|
||||
of the Host header and as such clients <= 1.9.2 can't talk anymore to the daemon.
|
||||
Docker supports overcoming this issue via a Docker daemon
|
||||
environment variable. In case you are seeing this error when contacting the
|
||||
daemon:
|
||||
|
||||
Error response from daemon: 400 Bad Request: malformed Host header
|
||||
|
||||
The `DOCKER_HTTP_HOST_COMPAT` can be set like this:
|
||||
|
||||
DOCKER_HTTP_HOST_COMPAT=1 /usr/local/bin/dockerd ...
|
||||
|
||||
|
||||
## Default cgroup parent
|
||||
|
||||
The `--cgroup-parent` option allows you to set the default cgroup parent
|
||||
|
|
Загрузка…
Ссылка в новой задаче