From 9e288a60873a4ae4dcde64c15ca5acedf0b23be0 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 23 Oct 2020 14:47:15 +0200
Subject: install python-docker together witch engine

---
 roles/apps/collabora/code/tasks/custom-image.yml | 5 -----
 roles/apps/nextcloud/tasks/custom-image.yml      | 5 -----
 roles/docker/engine/tasks/main.yml               | 4 +++-
 roles/elevate/media/tasks/main.yml               | 1 -
 4 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'roles')

diff --git a/roles/apps/collabora/code/tasks/custom-image.yml b/roles/apps/collabora/code/tasks/custom-image.yml
index b49ec667..38c453fa 100644
--- a/roles/apps/collabora/code/tasks/custom-image.yml
+++ b/roles/apps/collabora/code/tasks/custom-image.yml
@@ -12,11 +12,6 @@
     dest: "{{ collabora_code_base_path }}/{{ item.key }}/build/Dockerfile"
   register: nextcloud_custom_image_docker
 
-- name: install python-docker
-  apt:
-    name: "{{ python_basename }}-docker"
-    state: present
-
 - name: build custom image
   docker_image:
     name: "collabora/code/{{ item.key }}:{{ item.value.version }}"
diff --git a/roles/apps/nextcloud/tasks/custom-image.yml b/roles/apps/nextcloud/tasks/custom-image.yml
index 5aac75e0..3d9e31d1 100644
--- a/roles/apps/nextcloud/tasks/custom-image.yml
+++ b/roles/apps/nextcloud/tasks/custom-image.yml
@@ -19,11 +19,6 @@
     dest: "{{ nextcloud_base_path }}/{{ item.key }}/build/Dockerfile"
   register: nextcloud_custom_image_docker
 
-- name: install python-docker
-  apt:
-    name: "{{ python_basename }}-docker"
-    state: present
-
 - name: build custom image
   docker_image:
     name: "nextcloud/{{ item.key }}:{{ item.value.version }}"
diff --git a/roles/docker/engine/tasks/main.yml b/roles/docker/engine/tasks/main.yml
index 68a6504e..6c07797e 100644
--- a/roles/docker/engine/tasks/main.yml
+++ b/roles/docker/engine/tasks/main.yml
@@ -29,7 +29,9 @@
 
 - name: install docker
   apt:
-    name: "{{ docker_pkg_name }}{% if docker_pkg_version is defined %}={{ docker_pkg_version }}{% endif %}"
+    name:
+    - "{{ docker_pkg_name }}{% if docker_pkg_version is defined %}={{ docker_pkg_version }}{% endif %}"
+    - "{{ python_basename }}-docker"
     state: present
     force: yes
 
diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml
index 21cdd26f..89bf2038 100644
--- a/roles/elevate/media/tasks/main.yml
+++ b/roles/elevate/media/tasks/main.yml
@@ -4,7 +4,6 @@
     name:
       - mdadm
       - nginx
-      - "{{ python_basename }}-docker"
       - systemd-docker
       - "{{ python_basename }}-openssl"
       - samba
-- 
cgit v1.2.3