From d156449819ba9bbc4feea01e307904000c5f9937 Mon Sep 17 00:00:00 2001
From: Markos Chandras <hwoarang@users.noreply.github.com>
Date: Thu, 27 Dec 2018 15:26:02 +0000
Subject: [PATCH] roles: docker: Update docker service for SUSE distributions
(#3924)
The containerd service and socket files have been dropped from the
openSUSE docker package so we should not require them in the docker
service anymore. This makes the docker service file look similar to
the one shipped by the openSUSE package.
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
roles/container-engine/docker/templates/docker.service.j2 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/roles/container-engine/docker/templates/docker.service.j2 b/roles/container-engine/docker/templates/docker.service.j2
index c3e2d85a7..526dc2ccd 100644
--- a/roles/container-engine/docker/templates/docker.service.j2
+++ b/roles/container-engine/docker/templates/docker.service.j2
@@ -8,8 +8,7 @@ Wants=docker-storage-setup.service
After=network.target docker.socket
Wants=docker.socket
{% elif ansible_os_family == "Suse" %}
-After=network.target containerd.socket containerd.service
-Requires=containerd.socket containerd.service
+After=network.target
{% endif %}
[Service]
@@ -23,7 +22,7 @@ Delegate=yes
KillMode=process
ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout is version('17.03', '<') %} daemon{% else %}d{% endif %} \
{% if ansible_os_family == "Suse" %}
- --containerd /run/containerd/containerd.sock --add-runtime oci=/usr/bin/docker-runc \
+ --add-runtime oci=/usr/sbin/docker-runc \
{% endif %}
$DOCKER_OPTS \
$DOCKER_STORAGE_OPTIONS \
--
GitLab