From 79417e07ca4033d162eb94d8c66a82bf8f44f9ce Mon Sep 17 00:00:00 2001
From: Thomas Sarboni <max-k@post.com>
Date: Fri, 8 Dec 2017 14:12:45 +0100
Subject: [PATCH] Fix systemd service unit for docker >= 17.03 (#1844)
---
roles/docker/templates/docker.service.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/docker/templates/docker.service.j2 b/roles/docker/templates/docker.service.j2
index 29a80c107..7b066ea6d 100644
--- a/roles/docker/templates/docker.service.j2
+++ b/roles/docker/templates/docker.service.j2
@@ -18,7 +18,7 @@ Environment=GOTRACEBACK=crash
ExecReload=/bin/kill -s HUP $MAINPID
Delegate=yes
KillMode=process
-ExecStart={{ docker_bin_dir }}/docker daemon \
+ExecStart={{ docker_bin_dir }}/docker{% if docker_version.stdout|version_compare('17.03', '<') %} daemon{% else %}d{% endif %} \
$DOCKER_OPTS \
$DOCKER_STORAGE_OPTIONS \
$DOCKER_NETWORK_OPTIONS \
--
GitLab