From e2592f1ce2d8038f9c9fc98e368e466d91907c0c Mon Sep 17 00:00:00 2001
From: Chad Swenson <chadswen@gmail.com>
Date: Tue, 22 Jan 2019 11:19:54 -0600
Subject: [PATCH] Fix docker 18.09.1 systemd service
The `docker-ce` 18.09.1 packaging missed an `After` dependency on containerd in the systemd service. Upstream PR: https://github.com/docker/docker-ce-packaging/pull/290
---
roles/container-engine/docker/templates/docker.service.j2 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/container-engine/docker/templates/docker.service.j2 b/roles/container-engine/docker/templates/docker.service.j2
index 526dc2ccd..74d303eb9 100644
--- a/roles/container-engine/docker/templates/docker.service.j2
+++ b/roles/container-engine/docker/templates/docker.service.j2
@@ -2,13 +2,13 @@
Description=Docker Application Container Engine
Documentation=http://docs.docker.com
{% if ansible_os_family == "RedHat" %}
-After=network.target docker-storage-setup.service
+After=network.target docker-storage-setup.service{% if installed_docker_version.stdout is version('18.09.1', '>=') %} containerd.service{% endif %}
Wants=docker-storage-setup.service
{% elif ansible_os_family == "Debian" %}
-After=network.target docker.socket
+After=network.target docker.socket{% if installed_docker_version.stdout is version('18.09.1', '>=') %} containerd.service{% endif %}
Wants=docker.socket
{% elif ansible_os_family == "Suse" %}
-After=network.target
+After=network.target{% if installed_docker_version.stdout is version('18.09.1', '>=') %} containerd.service{% endif %}
{% endif %}
[Service]
--
GitLab