From: Paul R. Tagliamonte <paultag@debian.org>
Date: Sun, 14 Jun 2020 20:12:29 +0000 (+0100)
Subject: Use EnvironmentFile with the systemd unit file.
X-Git-Tag: archive/raspbian/18.09.1+dfsg1-7.1+rpi1+deb10u2^2~36
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=def63ce59fae84c9b76557a4897e79c6725b71cc;p=docker.io.git

Use EnvironmentFile with the systemd unit file.

Last-Update: 2014-05-07
Bug-Debian: http://bugs.debian.org/746774
Forwarded: no


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