From 92f13ceb5254c24ff5ae2f4f8ec99a0bc010636a Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 6 Aug 2014 22:41:09 -0700 Subject: [PATCH] Disable docker restarts, for now If the docker daemon goes down and comes up, it will try to restart containers. This will race with our own restart loop. Only one loop should be controlling restarts, probably. --- cluster/saltbase/salt/docker/docker-defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults index d96b4d079aefc..98a4f5b0d74b6 100644 --- a/cluster/saltbase/salt/docker/docker-defaults +++ b/cluster/saltbase/salt/docker/docker-defaults @@ -1 +1 @@ -DOCKER_OPTS="--bridge cbr0 --iptables=false" +DOCKER_OPTS="--bridge cbr0 --iptables=false -r=false"