projects
/
docker.io.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b72056
)
change-system-unit-env-file
author
Paul Tagliamonte
<paultag@debian.org>
Tue, 12 Jul 2016 14:46:35 +0000
(15:46 +0100)
committer
Tianon Gravi
<tianon@debian.org>
Tue, 12 Jul 2016 14:46:35 +0000
(15:46 +0100)
Gbp-Pq: Name change-system-unit-env-file.patch
contrib/init/systemd/docker.service
patch
|
blob
|
history
diff --git
a/contrib/init/systemd/docker.service
b/contrib/init/systemd/docker.service
index 75cb68c8b3f5ad29d561e0db8a0937ed21828479..f98012c89efa9696c72e6c89b215f585bbdd72ef 100644
(file)
--- 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