mirror of
https://github.com/geerlingguy/ansible-role-docker.git
synced 2025-09-12 17:50:53 +02:00
[rootless docker] Maintain idempotency in 'command' routines
This commit is contained in:
parent
5685a017bb
commit
218e162054
@ -26,12 +26,13 @@
|
|||||||
- name: Install rootless docker
|
- name: Install rootless docker
|
||||||
become: false
|
become: false
|
||||||
command: /usr/bin/dockerd-rootless-setuptool.sh install
|
command: /usr/bin/dockerd-rootless-setuptool.sh install
|
||||||
|
when: rootless_conf.stat.exists == false
|
||||||
|
|
||||||
- name: Enable and start rootless docker
|
- name: Enable and start rootless docker
|
||||||
become: false
|
become: false
|
||||||
systemd:
|
systemd:
|
||||||
name: docker
|
name: docker.service
|
||||||
state: started
|
state: restarted
|
||||||
enabled: true
|
enabled: true
|
||||||
scope: user
|
scope: user
|
||||||
|
|
||||||
|
@ -65,10 +65,15 @@
|
|||||||
when: docker_daemon_options.keys() | length > 0
|
when: docker_daemon_options.keys() | length > 0
|
||||||
notify: restart docker
|
notify: restart docker
|
||||||
|
|
||||||
|
- name: Stat for rootless docker
|
||||||
|
stat:
|
||||||
|
path: "{{ lookup('env', 'XDG_RUNTIME_DIR') }}/docker.sock"
|
||||||
|
register: rootless_conf
|
||||||
|
|
||||||
- name: Uninstall rootless docker
|
- name: Uninstall rootless docker
|
||||||
become: false
|
become: false
|
||||||
command: /usr/bin/dockerd-rootless-setuptool.sh uninstall --force
|
command: /usr/bin/dockerd-rootless-setuptool.sh uninstall --force
|
||||||
when: docker_rootless == false
|
when: docker_rootless == false and rootless_conf.stat.exists
|
||||||
|
|
||||||
- name: Ensure Docker is started and enabled at boot
|
- name: Ensure Docker is started and enabled at boot
|
||||||
service:
|
service:
|
||||||
|
Loading…
Reference in New Issue
Block a user