1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Remove DOCKER_HTTP_HOST_COMPAT env var

Signed-off-by: Darren Shepherd <darren@rancher.com>
This commit is contained in:
Darren Shepherd 2016-05-21 20:40:15 -07:00
parent e3079b4704
commit 989f6f852f
2 changed files with 6 additions and 22 deletions

View file

@ -114,14 +114,12 @@ func notifyShutdown(err error) {
} }
func wrapListeners(proto string, ls []net.Listener) []net.Listener { func wrapListeners(proto string, ls []net.Listener) []net.Listener {
if os.Getenv("DOCKER_HTTP_HOST_COMPAT") != "" { switch proto {
switch proto { case "unix":
case "unix": ls[0] = &hack.MalformedHostHeaderOverride{ls[0]}
ls[0] = &hack.MalformedHostHeaderOverride{ls[0]} case "fd":
case "fd": for i := range ls {
for i := range ls { ls[i] = &hack.MalformedHostHeaderOverride{ls[i]}
ls[i] = &hack.MalformedHostHeaderOverride{ls[i]}
}
} }
} }
return ls return ls

View file

@ -849,20 +849,6 @@ set like this:
export DOCKER_TMPDIR=/mnt/disk2/tmp 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 /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 ## Default cgroup parent
The `--cgroup-parent` option allows you to set the default cgroup parent The `--cgroup-parent` option allows you to set the default cgroup parent