Browse code

use systemd socket-activation by default

modified: contrib/init/systemd/docker.service
renamed: contrib/init/systemd/socket-activation/docker.socket -> contrib/init/systemd/docker.socket
deleted: contrib/init/systemd/socket-activation/docker.service

Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (github: lsm5)

Lokesh Mandvekar authored on 2014/07/15 07:39:42
Showing 4 changed files
... ...
@@ -4,7 +4,7 @@ Documentation=http://docs.docker.com
4 4
 After=network.target
5 5
 
6 6
 [Service]
7
-ExecStart=/usr/bin/docker -d
7
+ExecStart=/usr/bin/docker -d -H fd://
8 8
 Restart=on-failure
9 9
 LimitNOFILE=1048576
10 10
 LimitNPROC=1048576
11 11
new file mode 100644
... ...
@@ -0,0 +1,11 @@
0
+[Unit]
1
+Description=Docker Socket for the API
2
+
3
+[Socket]
4
+ListenStream=/var/run/docker.sock
5
+SocketMode=0660
6
+SocketUser=root
7
+SocketGroup=docker
8
+
9
+[Install]
10
+WantedBy=sockets.target
0 11
deleted file mode 100644
... ...
@@ -1,13 +0,0 @@
1
-[Unit]
2
-Description=Docker Application Container Engine
3
-Documentation=http://docs.docker.com
4
-After=network.target
5
-
6
-[Service]
7
-ExecStart=/usr/bin/docker -d -H fd://
8
-Restart=on-failure
9
-LimitNOFILE=1048576
10
-LimitNPROC=1048576
11
-
12
-[Install]
13
-WantedBy=multi-user.target
14 1
deleted file mode 100644
... ...
@@ -1,11 +0,0 @@
1
-[Unit]
2
-Description=Docker Socket for the API
3
-
4
-[Socket]
5
-ListenStream=/var/run/docker.sock
6
-SocketMode=0660
7
-SocketUser=root
8
-SocketGroup=docker
9
-
10
-[Install]
11
-WantedBy=sockets.target