From 6821d808813b2791a0b746dcdb451885f1c0e01f Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 29 Nov 2018 00:47:07 +0000 Subject: [PATCH] Add socket activation for RHEL based distributions 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 --- contrib/init/systemd/docker.service | 2 +- systemd/00-socket-activation.conf | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 systemd/00-socket-activation.conf diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service index 1fcd881215..eb841d1356 100644 --- a/contrib/init/systemd/docker.service +++ b/contrib/init/systemd/docker.service @@ -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 diff --git a/systemd/00-socket-activation.conf b/systemd/00-socket-activation.conf deleted file mode 100644 index b1ccee049f..0000000000 --- a/systemd/00-socket-activation.conf +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -After=docker.socket -Requires=docker.socket - -[Service] -ExecStart= -ExecStart=/usr/bin/dockerd -H fd://