From fe68df36fc9c85ae30af9bf53a13e8af0534e613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Sat, 26 Jul 2014 16:41:50 +0200 Subject: [PATCH 1/3] Fix ordering in systemd service file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See: https://bugs.archlinux.org/task/41338 Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer (github: seblu) --- contrib/init/systemd/docker.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service index c67c795ed9..1ff54fcd00 100644 --- a/contrib/init/systemd/docker.service +++ b/contrib/init/systemd/docker.service @@ -1,7 +1,7 @@ [Unit] Description=Docker Application Container Engine Documentation=http://docs.docker.com -After=network.target +After=network.target docker.socket Requires=docker.socket [Service] From 0f26195a8ddd0bde95865816576d827a9ed0727c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Sat, 26 Jul 2014 16:42:24 +0200 Subject: [PATCH 2/3] Systemd .service should install .socket MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And remove the WantedBy directive. See: https://bugs.archlinux.org/task/41338 Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer (github: seblu) --- contrib/init/systemd/docker.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service index 1ff54fcd00..7e32b02ae1 100644 --- a/contrib/init/systemd/docker.service +++ b/contrib/init/systemd/docker.service @@ -11,4 +11,4 @@ LimitNOFILE=1048576 LimitNPROC=1048576 [Install] -WantedBy=multi-user.target +Also=docker.socket From 533916fa6bb0b19fb887b5b0b2b704b224154b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Sat, 26 Jul 2014 16:43:28 +0200 Subject: [PATCH 3/3] Systemd service should not restart on failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should not be done by default but used by adminsys with a drop-in.d file, for buggy daemons which crash without known fixes. Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer (github: seblu) --- contrib/init/systemd/docker.service | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service index 7e32b02ae1..0cb31e32c0 100644 --- a/contrib/init/systemd/docker.service +++ b/contrib/init/systemd/docker.service @@ -6,7 +6,6 @@ Requires=docker.socket [Service] ExecStart=/usr/bin/docker -d -H fd:// -Restart=on-failure LimitNOFILE=1048576 LimitNPROC=1048576