Skip to content

Commit

Permalink
Stop using Docker's -r flag
Browse files Browse the repository at this point in the history
It has been deprecated since 1.3, replaced by restart policies.  We are
not supporting docker < 1.3 any more.
  • Loading branch information
thockin committed Feb 28, 2015
1 parent 6c5b390 commit d46146d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/docker/docker-defaults
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ DOCKER_OPTS=""
{% if grains.docker_opts is defined and grains.docker_opts %}
DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
{% 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

0 comments on commit d46146d

Please sign in to comment.