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:
bda6b3f
)
change-system-unit-env-file
author
Paul Tagliamonte
<paultag@debian.org>
Sat, 3 Jan 2015 07:11:47 +0000
(07:11 +0000)
committer
Tianon Gravi
<admwiggin@gmail.com>
Sat, 3 Jan 2015 07:11:47 +0000
(07:11 +0000)
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 83c810d13a6efeb20237d3d0e910a9eab2d31d1c..d9495d7c0a7c56c861ffe33b4fd7626b8d238dcc 100644
(file)
--- a/
contrib/init/systemd/docker.service
+++ b/
contrib/init/systemd/docker.service
@@
-5,7
+5,8
@@
After=network.target docker.socket
Requires=docker.socket
[Service]
-ExecStart=/usr/bin/docker -d -H fd://
+EnvironmentFile=-/etc/default/docker
+ExecStart=/usr/bin/docker -d -H fd:// $DOCKER_OPTS
LimitNOFILE=1048576
LimitNPROC=1048576