From 5105981431def23a7424a0c0c09095d815243ea9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Jul 2014 16:54:55 -0500 Subject: [PATCH 1/3] add systemd MAINTAINERS file new file: contrib/init/systemd/MAINTAINERS Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar (github: lsm5) --- contrib/init/systemd/MAINTAINERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 contrib/init/systemd/MAINTAINERS diff --git a/contrib/init/systemd/MAINTAINERS b/contrib/init/systemd/MAINTAINERS new file mode 100644 index 000000000..0c6b0e9d7 --- /dev/null +++ b/contrib/init/systemd/MAINTAINERS @@ -0,0 +1 @@ +Lokesh Mandvekar (@lsm5) From 076ac1d7d212c3a81a401a2fba8b9965bc26df16 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Jul 2014 17:39:42 -0500 Subject: [PATCH 2/3] 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 (github: lsm5) --- contrib/init/systemd/docker.service | 2 +- .../systemd/{socket-activation => }/docker.socket | 0 .../init/systemd/socket-activation/docker.service | 13 ------------- 3 files changed, 1 insertion(+), 14 deletions(-) rename contrib/init/systemd/{socket-activation => }/docker.socket (100%) delete mode 100644 contrib/init/systemd/socket-activation/docker.service diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service index 6f3cc33c3..4af71378c 100644 --- a/contrib/init/systemd/docker.service +++ b/contrib/init/systemd/docker.service @@ -4,7 +4,7 @@ Documentation=http://docs.docker.com After=network.target [Service] -ExecStart=/usr/bin/docker -d +ExecStart=/usr/bin/docker -d -H fd:// Restart=on-failure LimitNOFILE=1048576 LimitNPROC=1048576 diff --git a/contrib/init/systemd/socket-activation/docker.socket b/contrib/init/systemd/docker.socket similarity index 100% rename from contrib/init/systemd/socket-activation/docker.socket rename to contrib/init/systemd/docker.socket diff --git a/contrib/init/systemd/socket-activation/docker.service b/contrib/init/systemd/socket-activation/docker.service deleted file mode 100644 index 4af71378c..000000000 --- a/contrib/init/systemd/socket-activation/docker.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=http://docs.docker.com -After=network.target - -[Service] -ExecStart=/usr/bin/docker -d -H fd:// -Restart=on-failure -LimitNOFILE=1048576 -LimitNPROC=1048576 - -[Install] -WantedBy=multi-user.target From 0bde827c3f01fc5ae99eb0b93170e75c99cd5d77 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 14 Jul 2014 18:07:40 -0500 Subject: [PATCH 3/3] systemd unitfile requires docker.socket modified: contrib/init/systemd/docker.service Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar (github: lsm5) --- contrib/init/systemd/docker.service | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service index 4af71378c..c67c795ed 100644 --- a/contrib/init/systemd/docker.service +++ b/contrib/init/systemd/docker.service @@ -2,6 +2,7 @@ Description=Docker Application Container Engine Documentation=http://docs.docker.com After=network.target +Requires=docker.socket [Service] ExecStart=/usr/bin/docker -d -H fd://