Extract docker cleanup stuff into its own role

ansible/main.yml

@@ -20,4 +20,5 @@
         docker_install_compose: false  # This role installs the binary directly, which is kinda nasty
         docker_users:
           - "{{ user }}"
+    - docker-cleanup
     - docker

ansible/roles/docker-cleanup/tasks/main.yml

@@ -1,3 +1,6 @@
+- name: Include docker variables
+  include_vars: docker.yml
+
 - name: Install docker-compose
   apt:
     name: docker-compose

ansible/roles/docker-cleanup/vars/docker.yml

@@ -0,0 +1,3 @@
+docker_user:
+  id: 3000
+  name: dockeruser

ansible/roles/docker/tasks/main.yml

@@ -1,9 +1,6 @@
 - name: Include docker variables
   include_vars: docker.yml
 
-- name: Install Docker
-  include: setup-docker.yml
-
 # Applications
 
 - name: Install calibre

ansible/roles/docker/vars/docker.yml

@@ -1,6 +1,2 @@
-docker_user:
-  id: 3000
-  name: dockeruser
-
 docker_compose_file_mask: 0664
 docker_compose_directory_mask: 0775