p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove DOCKER_HTTP_HOST_COMPAT env var

Browse Source 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 989f6f852f639404f8e86e179ce5389e2d29c5d2
Component: engine
This commit is contained in:
Darren Shepherd
2016-05-21 20:40:15 -07:00
parent a24dcb8ba0
commit d17ab45ce6
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/engine/cmd/dockerd/daemon_unix.go
View File

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

14
components/engine/docs/reference/commandline/dockerd.md
View File

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