Merge pull request #20281 from cilium-team/fixing-docker-d

Auto commit by PR queue bot
2016-02-28 03:51:31 -08:00
parent 5ecbf4ff4a 97acdf4cd8
commit a0b04a6df8
6 changed files with 39 additions and 11 deletions
--- a/cluster/saltbase/salt/docker/docker.service
+++ b/cluster/saltbase/salt/docker/docker.service
@@ -6,7 +6,7 @@ Requires=docker.socket

 [Service]
 EnvironmentFile={{ environment_file }}
-ExecStart=/usr/bin/docker -d -H fd:// "$DOCKER_OPTS"
+ExecStart=/usr/bin/docker daemon -H fd:// "$DOCKER_OPTS"
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576