Browse Source
Merge pull request #4085 from chadswen/docker-systemd-after-containerd
Fix docker 18.09.1 systemd service
pull/4086/head
Chad Swenson
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
roles/container-engine/docker/templates/docker.service.j2
|
|
@ -2,13 +2,13 @@ |
|
|
Description=Docker Application Container Engine |
|
|
Description=Docker Application Container Engine |
|
|
Documentation=http://docs.docker.com |
|
|
Documentation=http://docs.docker.com |
|
|
{% if ansible_os_family == "RedHat" %} |
|
|
{% 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 |
|
|
Wants=docker-storage-setup.service |
|
|
{% elif ansible_os_family == "Debian" %} |
|
|
{% 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 |
|
|
Wants=docker.socket |
|
|
{% elif ansible_os_family == "Suse" %} |
|
|
{% 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 %} |
|
|
{% endif %} |
|
|
|
|
|
|
|
|
[Service] |
|
|
[Service] |
|
|
|
