From: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Date: Tue, 12 Nov 2019 01:18:22 +0000 (+0000)
Subject: debian-systemd-unit-environment-file
X-Git-Tag: archive/raspbian/19.03.4+dfsg2-2+rpi1^2~25
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f5390a9c0928fc635a6ca43fba1a2949e85f91de;p=docker.io.git

debian-systemd-unit-environment-file


Gbp-Pq: Name debian-systemd-unit-environment-file.patch
---

diff --git a/engine/contrib/init/systemd/docker.service b/engine/contrib/init/systemd/docker.service
index dd285b91..0d7b4472 100644
--- a/engine/contrib/init/systemd/docker.service
+++ b/engine/contrib/init/systemd/docker.service
@@ -10,7 +10,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/dockerd -H fd://
+EnvironmentFile=-/etc/default/docker
+ExecStart=/usr/bin/dockerd -H fd:// $DOCKER_OPTS
 ExecReload=/bin/kill -s HUP $MAINPID
 LimitNOFILE=1048576
 # Having non-zero Limit*s causes performance problems due to accounting overhead