mirror of
https://github.com/geerlingguy/ansible-role-docker.git
synced 2025-08-15 13:48:28 +02:00
Fix: for 18.09.x
- add an override for docker.service (param -H fd://) conflicts qith /etc/docker/daemon.json - refactor code to "with_items" for containerd/docker
This commit is contained in:
parent
6ec0977b17
commit
951b919d30
@ -1,13 +1,19 @@
|
|||||||
---
|
---
|
||||||
- name: Ensure containerd service dir exists.
|
- name: Ensure service directories exist.
|
||||||
file:
|
file:
|
||||||
path: /etc/systemd/system/containerd.service.d
|
path: /etc/systemd/system/{{ item }}
|
||||||
state: directory
|
state: directory
|
||||||
|
with_items:
|
||||||
|
- containerd.service.d
|
||||||
|
- docker.service.d
|
||||||
|
|
||||||
- name: Add shim to ensure Docker can start in all environments.
|
- name: Add overrides.
|
||||||
template:
|
template:
|
||||||
src: override.conf.j2
|
src: "override-{{ item }}.conf.j2"
|
||||||
dest: /etc/systemd/system/containerd.service.d/override.conf
|
dest: /etc/systemd/system/{{ item }}.service.d/override.conf
|
||||||
|
with_items:
|
||||||
|
- containerd
|
||||||
|
- docker
|
||||||
register: override_template
|
register: override_template
|
||||||
|
|
||||||
- name: Reload systemd daemon if template is changed.
|
- name: Reload systemd daemon if template is changed.
|
||||||
|
4
templates/override-docker.conf.j2
Normal file
4
templates/override-docker.conf.j2
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
# {{ ansible_managed }}
|
||||||
|
[Service]
|
||||||
|
ExecStart=
|
||||||
|
ExecStart=/usr/bin/dockerd
|
Loading…
Reference in New Issue
Block a user