From 0eef25269a8eab0fca0f63cdc81d5e5fbad2ebbf Mon Sep 17 00:00:00 2001 From: John Robbins Date: Mon, 10 Apr 2023 10:31:20 -0600 Subject: [PATCH] [rootless docker] Allow switching back to root docker if docker_rootless == false --- tasks/docker-rootless.yml | 2 +- tasks/main.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tasks/docker-rootless.yml b/tasks/docker-rootless.yml index 4213d88..c162d74 100644 --- a/tasks/docker-rootless.yml +++ b/tasks/docker-rootless.yml @@ -32,7 +32,7 @@ systemd: name: docker state: started - enabled: yes + enabled: true scope: user - name: Decouple rootless docker from user session diff --git a/tasks/main.yml b/tasks/main.yml index b979df2..f85a3f5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -65,6 +65,11 @@ when: docker_daemon_options.keys() | length > 0 notify: restart docker +- name: Uninstall rootless docker + become: false + command: /usr/bin/dockerd-rootless-setuptool.sh uninstall --force + when: docker_rootless == false + - name: Ensure Docker is started and enabled at boot service: name: docker