From: Paul Tagliamonte <paultag@debian.org>
Date: Tue, 12 Jul 2016 14:46:35 +0000 (+0100)
Subject: change-system-unit-env-file
X-Git-Tag: archive/raspbian/18.09.1+dfsg1-7+rpi1~1^2^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ffde12636aab8c236a32d9286f8b9c6d49936019;p=docker.io.git

change-system-unit-env-file


Gbp-Pq: Name change-system-unit-env-file.patch
---

diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
index 75cb68c8..f98012c8 100644
--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
@@ -9,7 +9,8 @@ Type=notify
 # the default is not to use systemd for cgroups because the delegate issues still
 # exists and systemd currently does not support the cgroup feature set required
 # for containers run by docker
-ExecStart=/usr/bin/docker daemon -H fd://
+EnvironmentFile=-/etc/default/docker
+ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576