From aa5101a12f01fc7dcc8b6153bb1faac466fc9542 Mon Sep 17 00:00:00 2001 From: Marek Matulka Date: Thu, 23 Mar 2017 23:32:39 +0000 Subject: [PATCH] Use right configuration file on systemd systems --- src/Installer/DNS/Linux/DnsDock.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Installer/DNS/Linux/DnsDock.php b/src/Installer/DNS/Linux/DnsDock.php index f55eb24..c62a200 100644 --- a/src/Installer/DNS/Linux/DnsDock.php +++ b/src/Installer/DNS/Linux/DnsDock.php @@ -51,8 +51,9 @@ public function run() if (!$this->hasDockerOptions()) { $this->userInteraction->writeTitle('Configuring DNS resolution for Docker containers'); - $this->processRunner->run('echo \'DOCKER_OPTS="--bip='.self::IP.'/24 --dns '.self::IP.'"\' | sudo tee -a /etc/default/docker'); - $this->processRunner->run('sudo service docker restart'); + $this->processRunner->run('echo -e \'[Service]\nExecStart=\nExecStart=/usr/bin/dockerd --bip='.self::IP.'/24 --dns '.self::IP.'\' | sudo tee -a /etc/systemd/system/docker.service.d/docker.conf'); + $this->processRunner->run('sudo systemctl daemon-reload'); + $this->processRunner->run('sudo systemctl restart docker'); } $this->processRunner->run('sudo docker start dnsdock || sudo docker run -d -v /var/run/docker.sock:/var/run/docker.sock --name dnsdock -p 172.17.42.1:53:53/udp aacebedo/dnsdock:latest-amd64'); @@ -60,6 +61,6 @@ public function run() private function hasDockerOptions() { - return $this->processRunner->run('grep "^DOCKER_OPTS" /etc/default/docker', false)->isSuccessful(); + return $this->processRunner->run('grep "\-\-bip\='.self::IP.'" /etc/systemd/system/docker.service.d/docker.conf', false)->isSuccessful(); } }