toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add socket activation for RHEL based distributions

Browse Source 
Removes the systemd drop-in unit file for socket activation and instead
prefers socket activation by default for both RHEL based and DEBIAN
based distributions.

Socket activation for RHEL based distributions was tested on CentOS 7 and Fedora 28.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 91c85cd38197b9d92d5b3e8a1b577d3178d73fcc)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6a7e302c260a2ff7e4d8b7a6d01249a09c140618
Component: packaging
This commit is contained in:
Eli Uriegas
2018-11-30 19:43:29 +00:00
parent b766ec9947
commit 8293f65feb
6 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/packaging/systemd/00-socket-activation.conf
-7
View File
@@ -1,7 +0,0 @@
[Unit]
After=docker.socket
Requires=docker.socket
[Service]
ExecStart=
ExecStart=/usr/bin/dockerd -H fd://
components/packaging/systemd/docker.service
+1 -1
View File
@@ -10,7 +10,7 @@ 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
ExecStart=/usr/bin/dockerd -H fd://
ExecReload=/bin/kill -s HUP $MAINPID
TimeoutSec=0
RestartSec=2