From 31e0b3454ce5b2aaea960ef778bc4432c22e002b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Tue, 9 Feb 2016 11:15:01 +0900 Subject: [PATCH] Fix Vagrant provisioning with docker 1.10 docker 1.10 removed the -d flag in favor of "daemon". Also adjust docker config to enable shared mount namespace. Closes-Bug: #1543201 Change-Id: I14cb497e0e02d90cdf74de8a09cca346f68254ab --- dev/vagrant/centos-bootstrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/vagrant/centos-bootstrap.sh b/dev/vagrant/centos-bootstrap.sh index 4589bd3604..0573621244 100644 --- a/dev/vagrant/centos-bootstrap.sh +++ b/dev/vagrant/centos-bootstrap.sh @@ -58,7 +58,8 @@ EOF # Despite it shipping with /etc/sysconfig/docker, Docker is not configured to # load it from it's service file. - sed -i -r "s,(ExecStart)=(.+),\1=/usr/bin/docker -d --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}," /usr/lib/systemd/system/docker.service + sed -i -r "s|(ExecStart)=(.+)|\1=/usr/bin/docker daemon --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}|" /usr/lib/systemd/system/docker.service + sed -i 's|^MountFlags=.*|MountFlags=shared|' /usr/lib/systemd/system/docker.service systemctl daemon-reload systemctl enable docker