From 5a18def5ed0e656cb00a1042182dc4baa9b809c2 Mon Sep 17 00:00:00 2001
From: Stefan Haun <tux@netz39.de>
Date: Wed, 25 Nov 2020 16:56:28 +0100
Subject: [PATCH] Use docker-install

---
 main.yml                                   |  9 ++-
 tasks/{docker_setup.yml => docker_env.yml} |  0
 tasks/docker_install.yml                   | 92 ----------------------
 3 files changed, 6 insertions(+), 95 deletions(-)
 rename tasks/{docker_setup.yml => docker_env.yml} (100%)
 delete mode 100644 tasks/docker_install.yml

diff --git a/main.yml b/main.yml
index 0851bec..008a3ad 100644
--- a/main.yml
+++ b/main.yml
@@ -50,10 +50,13 @@
       include_tasks: tasks/users.yml
 
     - name: Install Docker
-      include_tasks: tasks/docker_install.yml
+      include_role:
+        name: install-docker
+      vars:
+        docker_users: "{{ admin_users }}"
 
-    - name: Setup Docker Containers
-      include_tasks: tasks/docker_setup.yml
+    - name: Setup Docker Environment
+      include_tasks: tasks/docker_env.yml
 
     - name: Setup httpd
       include_tasks: tasks/httpd.yml
diff --git a/tasks/docker_setup.yml b/tasks/docker_env.yml
similarity index 100%
rename from tasks/docker_setup.yml
rename to tasks/docker_env.yml
diff --git a/tasks/docker_install.yml b/tasks/docker_install.yml
deleted file mode 100644
index 38c91bf..0000000
--- a/tasks/docker_install.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-# This file is a mash-up of:
-#   https://github.com/geerlingguy/ansible-role-docker/blob/master/tasks/docker-compose.yml
-#   https://www.digitalocean.com/community/tutorials/how-to-install-docker-compose-on-debian-9
-#   and our own stuff …
----
-- name: Gather package facts
-  package_facts:
-    manager: "auto"
-
-- name: Exit if docker.io is installed
-  fail:
-    msg: "Please remove docker.io (Debian vanilla docker package) first!"
-  when: "'docker.io' in ansible_facts.packages"
-
-- name: Install Docker APT deps
-  package:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-    - apt-transport-https
-    - ca-certificates
-    - gnupg2
-    - software-properties-common
-
-- name: add Docker apt-key
-  apt_key:
-    url: https://download.docker.com/linux/debian/gpg
-    state: present
-
-- name: add Docker's APT repository
-  apt_repository:
-   repo: deb https://download.docker.com/linux/debian buster stable
-   state: present
-   update_cache: true
-   filename: 'docker'
-
-- name: install Docker
-  package:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-    - docker-ce
-    - python-docker
-
-- name: Set docker configuration
-  copy:
-    dest: /etc/docker/daemon.json
-    content: |
-      {
-          "exec-opts": ["native.cgroupdriver=systemd"],
-          "log-driver": "json-file",
-              "log-opts": {
-                  "max-size": "100m"
-              }
-      }
-  register: docker_config
-
-- name: Restart docker for changed configuration
-  service:
-    name: docker
-    state: restarted
-    enabled: yes
-  when: docker_config.changed
-
-- name: Check current docker-compose version.
-  command: docker-compose --version
-  register: docker_compose_current_version
-  changed_when: false
-  failed_when: false
-
-- name: Delete existing docker-compose version if it's different.
-  file:
-    path: "{{ docker_compose_path }}"
-    state: absent
-  when: >
-    docker_compose_current_version.stdout is defined
-    and docker_compose_version not in docker_compose_current_version.stdout
-
-- name: Install Docker Compose (if configured).
-  get_url:
-    url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64
-    dest: "{{ docker_compose_path }}"
-    mode: 0755
-
-- name: Place admin users in docker group
-  user:
-    name: "{{ item }}"
-    groups: docker
-    append: yes
-  with_items: "{{ admin_users }}"