summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-11 14:36:19 -0500
committerGitHub <noreply@github.com>2017-05-11 14:36:19 -0500
commit593ef653c0d17876b871a221587a472cb0235c97 (patch)
tree9780cc520d32fd1fab88dd9462ee0aa2fc75a213 /roles
parente922dd4a43f927faf4a56769913fbd20531bdf42 (diff)
parent09448328fe526006619c970d4d2567e65cbff448 (diff)
downloadopenshift-593ef653c0d17876b871a221587a472cb0235c97.tar.gz
openshift-593ef653c0d17876b871a221587a472cb0235c97.tar.bz2
openshift-593ef653c0d17876b871a221587a472cb0235c97.tar.xz
openshift-593ef653c0d17876b871a221587a472cb0235c97.zip
Merge pull request #4164 from ashcrow/simplify-daemon-json
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/docker/README.md2
-rw-r--r--roles/docker/templates/daemon.json45
2 files changed, 2 insertions, 45 deletions
diff --git a/roles/docker/README.md b/roles/docker/README.md
index f25ca03cd..4a9f21f22 100644
--- a/roles/docker/README.md
+++ b/roles/docker/README.md
@@ -3,6 +3,8 @@ Docker
Ensures docker package or system container is installed, and optionally raises timeout for systemd-udevd.service to 5 minutes.
+daemon.json items may be found at https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file
+
Requirements
------------
diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json
index bebdd3cb2..c607e6afe 100644
--- a/roles/docker/templates/daemon.json
+++ b/roles/docker/templates/daemon.json
@@ -1,65 +1,20 @@
-
{
- "api-cors-header": "",
"authorization-plugins": ["rhel-push-plugin"],
- "bip": "",
- "bridge": "",
- "cgroup-parent": "",
- "cluster-store": "",
- "cluster-store-opts": {},
- "cluster-advertise": "",
- "debug": true,
- "default-gateway": "",
- "default-gateway-v6": "",
"default-runtime": "oci",
"containerd": "/run/containerd.sock",
- "default-ulimits": {},
"disable-legacy-registry": false,
- "dns": [],
- "dns-opts": [],
- "dns-search": [],
"exec-opts": ["native.cgroupdriver=systemd"],
- "exec-root": "",
- "fixed-cidr": "",
- "fixed-cidr-v6": "",
- "graph": "",
- "group": "",
- "hosts": [],
- "icc": false,
"insecure-registries": {{ l_docker_insecure_registries }},
- "ip": "0.0.0.0",
- "iptables": false,
- "ipv6": false,
- "ip-forward": false,
- "ip-masq": false,
- "labels": [],
- "live-restore": true,
{% if docker_log_driver is defined %}
"log-driver": "{{ docker_log_driver }}",
{%- endif %}
- "log-level": "",
"log-opts": {{ l_docker_log_options }},
- "max-concurrent-downloads": 3,
- "max-concurrent-uploads": 5,
- "mtu": 0,
- "oom-score-adjust": -500,
- "pidfile": "",
- "raw-logs": false,
- "registry-mirrors": [],
"runtimes": {
"oci": {
"path": "/usr/libexec/docker/docker-runc-current"
}
},
"selinux-enabled": {{ l_docker_selinux_enabled | lower }},
- "storage-driver": "",
- "storage-opts": [],
- "tls": true,
- "tlscacert": "",
- "tlscert": "",
- "tlskey": "",
- "tlsverify": true,
- "userns-remap": "",
"add-registry": {{ l_docker_additional_registries }},
"block-registry": {{ l_docker_blocked_registries }},
"userland-proxy-path": "/usr/libexec/docker/docker-proxy-current"