Skip to content

K
k3s
Commit d46146da authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Stop using Docker's -r flag

It has been deprecated since 1.3, replaced by restart policies. We are not supporting docker < 1.3 any more.
parent 6c5b3901
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/saltbase/salt/docker/docker-defaults
View file @ d46146da
...@@ -2,5 +2,5 @@ DOCKER_OPTS="" ...@@ -2,5 +2,5 @@ DOCKER_OPTS=""
{% if grains.docker_opts is defined and grains.docker_opts %} {% if grains.docker_opts is defined and grains.docker_opts %}
DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}" DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
{% endif %} {% endif %}
DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false" DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false"
DOCKER_NOFILE=1000000 DOCKER_NOFILE=1000000
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment