Modify calico docker.service

This commit is contained in:
Chris Bell 2016-06-22 09:44:31 -04:00 committed by GitHub
parent dc90c594c6
commit d94253ff6a

View file

@ -12,9 +12,9 @@ Requires=docker.socket
[Service] [Service]
Type=notify Type=notify
{% if ansible_os_family == "RedHat" %} {% if ansible_os_family == "RedHat" %}
EnvironmentFile=-/etc/sysconfig/docker EnvironmentFile=-/etc/default/docker
EnvironmentFile=-/etc/sysconfig/docker-network EnvironmentFile=-/etc/default/docker-network
EnvironmentFile=-/etc/sysconfig/docker-storage EnvironmentFile=-/etc/docker/docker-storage
{% elif ansible_os_family == "Debian" %} {% elif ansible_os_family == "Debian" %}
EnvironmentFile=-/etc/default/docker EnvironmentFile=-/etc/default/docker
{% endif %} {% endif %}
@ -23,7 +23,8 @@ ExecStart=/usr/bin/docker daemon \
$OPTIONS \ $OPTIONS \
$DOCKER_STORAGE_OPTIONS \ $DOCKER_STORAGE_OPTIONS \
$DOCKER_NETWORK_OPTIONS \ $DOCKER_NETWORK_OPTIONS \
$INSECURE_REGISTRY $INSECURE_REGISTRY \
$DOCKER_OPTS
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576
LimitCORE=infinity LimitCORE=infinity