ソースを参照

Add the docker.socket back in

Re-adds the docker.socket file for debian based distributions.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Eli Uriegas 6 年 前
コミット
07c9fef311

+ 1 - 1
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
 # 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
 # exists and systemd currently does not support the cgroup feature set required
 # for containers run by docker
 # for containers run by docker
-ExecStart=/usr/bin/dockerd -H unix://
+ExecStart=/usr/bin/dockerd
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecReload=/bin/kill -s HUP $MAINPID
 TimeoutSec=0
 TimeoutSec=0
 RestartSec=2
 RestartSec=2

+ 12 - 0
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

+ 7 - 0
systemd/00-socket-activation.conf

@@ -0,0 +1,7 @@
+[Unit]
+After=docker.socket
+Requires=docker.socket
+
+[Service]
+ExecStart=
+ExecStart=/usr/bin/dockerd -H fd://