summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-12 20:51:55 -0500
committerGitHub <noreply@github.com>2017-05-12 20:51:55 -0500
commit7eae68537d03c6c1ad849d6226e15631652b9c65 (patch)
treedbedf0dbe1513157972a7c94ca65d7e0af5c95d9
parentd2a435c32ebba0d8caa8b91009234ed66ac57c05 (diff)
parent6bc3ccc0968e75106818a5134467e44815a03425 (diff)
downloadopenshift-7eae68537d03c6c1ad849d6226e15631652b9c65.tar.gz
openshift-7eae68537d03c6c1ad849d6226e15631652b9c65.tar.bz2
openshift-7eae68537d03c6c1ad849d6226e15631652b9c65.tar.xz
openshift-7eae68537d03c6c1ad849d6226e15631652b9c65.zip
Merge pull request #4174 from ashcrow/remove-userland-proxy
Merged by openshift-bot
-rw-r--r--roles/docker/templates/daemon.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json
index c607e6afe..a41b7cdbd 100644
--- a/roles/docker/templates/daemon.json
+++ b/roles/docker/templates/daemon.json
@@ -16,6 +16,5 @@
},
"selinux-enabled": {{ l_docker_selinux_enabled | lower }},
"add-registry": {{ l_docker_additional_registries }},
- "block-registry": {{ l_docker_blocked_registries }},
- "userland-proxy-path": "/usr/libexec/docker/docker-proxy-current"
+ "block-registry": {{ l_docker_blocked_registries }}
}