From f4877cea21491605b593edf8f79de25731f58686 Mon Sep 17 00:00:00 2001
From: Jan Beilicke <dev@jotbe.io>
Date: Sat, 9 Dec 2023 19:11:43 +0100
Subject: [PATCH] Simplifies docker provisioning, fixes issue with docker 7.0
 pip packages through downgrade

---
 docker.yml            |  6 ++--
 group_vars/docker.yml | 11 ++------
 requirements.yml      | 64 +++++++++++++++++++++++--------------------
 3 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/docker.yml b/docker.yml
index 1d0c86d..e701c63 100644
--- a/docker.yml
+++ b/docker.yml
@@ -3,7 +3,9 @@
 
 - hosts: docker
   become: true
+  pre_tasks:
+    - name: Install pip packages for Docker
+      ansible.builtin.pip: 
+        name: "{{ pip_install_packages }}"
   roles:
-    - geerlingguy.pip
-    - geerlingguy.docker
     - jotbe.traefik-docker
\ No newline at end of file
diff --git a/group_vars/docker.yml b/group_vars/docker.yml
index 4067055..90dceef 100644
--- a/group_vars/docker.yml
+++ b/group_vars/docker.yml
@@ -1,11 +1,6 @@
-pip_package: python3-pip
+#pip_package: python3-pip
 pip_install_packages:
-  - name: docker
-  - name: docker-compose
-docker_edition: "ce"
-docker_version: "19.03.5"
-docker_package: "docker-{{ docker_edition }}"
-docker_package_state: present
-docker_compose_version: "1.25.0"
+  - docker==6.1.3
+  - docker-compose
 docker_users:
   - deploy
diff --git a/requirements.yml b/requirements.yml
index 2486598..4b1a76d 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,31 +1,35 @@
-- geerlingguy.firewall
-- geerlingguy.pip
-- geerlingguy.docker
+collections:
+  - community.docker
 
-- name: jotbe.common
-  src: https://git.jotbe.io/jotbe/ansible-role-common.git
-  scm: git
-- name: jotbe.traefik-docker
-  src: https://git.jotbe.io/jotbe/ansible-role-traefik-docker.git
-  scm: git
-- name: jotbe.nextcloud-docker
-  version: v1.0.2
-  src: https://git.jotbe.io/jotbe/ansible-role-nextcloud-docker.git
-  scm: git
-- name: jotbe.coturn-docker
-  src: https://git.jotbe.io/jotbe/ansible-role-coturn-docker.git
-  scm: git
-- name: jotbe.jitsi-docker
-  version: v1.0.0
-  src: https://git.jotbe.io/jotbe/ansible-role-jitsi-docker.git
-  scm: git
-- name: jotbe.collabora-online-docker
-  version: v1.0.0
-  src: https://git.jotbe.io/jotbe/ansible-role-collabora-online-docker.git
-  scm: git
-- name: jotbe.onlyoffice-document-server-docker
-  src: https://git.jotbe.io/jotbe/ansible-role-onlyoffice-document-server-docker.git
-  scm: git
-- name: jotbe.cryptpad-docker
-  src: https://git.jotbe.io/jotbe/ansible-role-cryptpad-docker.git
-  scm: git
+roles:
+  - geerlingguy.firewall
+  - geerlingguy.pip
+  # - geerlingguy.docker
+
+  - name: jotbe.common
+    src: https://git.jotbe.io/jotbe/ansible-role-common.git
+    scm: git
+  - name: jotbe.traefik-docker
+    src: https://git.jotbe.io/jotbe/ansible-role-traefik-docker.git
+    scm: git
+  - name: jotbe.nextcloud-docker
+    version: v1.0.2
+    src: https://git.jotbe.io/jotbe/ansible-role-nextcloud-docker.git
+    scm: git
+  - name: jotbe.coturn-docker
+    src: https://git.jotbe.io/jotbe/ansible-role-coturn-docker.git
+    scm: git
+  - name: jotbe.jitsi-docker
+    version: v1.0.0
+    src: https://git.jotbe.io/jotbe/ansible-role-jitsi-docker.git
+    scm: git
+  - name: jotbe.collabora-online-docker
+    version: v1.0.0
+    src: https://git.jotbe.io/jotbe/ansible-role-collabora-online-docker.git
+    scm: git
+  - name: jotbe.onlyoffice-document-server-docker
+    src: https://git.jotbe.io/jotbe/ansible-role-onlyoffice-document-server-docker.git
+    scm: git
+  - name: jotbe.cryptpad-docker
+    src: https://git.jotbe.io/jotbe/ansible-role-cryptpad-docker.git
+    scm: git