From 07c9fef311e5656a3737ddc56bdbbb3a0e287d29 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 8 Nov 2018 18:57:49 +0000 Subject: [PATCH] Add the docker.socket back in Re-adds the docker.socket file for debian based distributions. Signed-off-by: Eli Uriegas --- contrib/init/systemd/docker.service | 2 +- contrib/init/systemd/docker.socket | 12 ++++++++++++ systemd/00-socket-activation.conf | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 contrib/init/systemd/docker.socket create mode 100644 systemd/00-socket-activation.conf diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service index 41b3849a09..1fcd881215 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 -H unix:// +ExecStart=/usr/bin/dockerd ExecReload=/bin/kill -s HUP $MAINPID TimeoutSec=0 RestartSec=2 diff --git a/contrib/init/systemd/docker.socket b/contrib/init/systemd/docker.socket new file mode 100644 index 0000000000..7dd95098e4 --- /dev/null +++ b/contrib/init/systemd/docker.socket @@ -0,0 +1,12 @@ +[Unit] +Description=Docker Socket for the API +PartOf=docker.service + +[Socket] +ListenStream=/var/run/docker.sock +SocketMode=0660 +SocketUser=root +SocketGroup=docker + +[Install] +WantedBy=sockets.target diff --git a/systemd/00-socket-activation.conf b/systemd/00-socket-activation.conf new file mode 100644 index 0000000000..b1ccee049f --- /dev/null +++ b/systemd/00-socket-activation.conf @@ -0,0 +1,7 @@ +[Unit] +After=docker.socket +Requires=docker.socket + +[Service] +ExecStart= +ExecStart=/usr/bin/dockerd -H fd://