From a1ac25b56d56035bf10d754600c1ad24cd8fc827 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Thu, 22 Dec 2022 18:20:25 +0100 Subject: [PATCH] Don't install python bindings for docker-compose twice --- roles/docker/tasks/main.yml | 9 ++++++--- roles/ubuntu_base/tasks/base.yml | 8 -------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index a54eaa1..87c83d9 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -16,11 +16,14 @@ name: docker-ce state: present -- name: install docker python bindings +- name: Install necessary packages via pip pip: + name: "{{ packages }}" executable: "pip3" - name: "docker-compose" - state: present + vars: + packages: + - docker + - docker-compose - name: create folder structure for bind mounts file: diff --git a/roles/ubuntu_base/tasks/base.yml b/roles/ubuntu_base/tasks/base.yml index 63e452c..3289b2c 100644 --- a/roles/ubuntu_base/tasks/base.yml +++ b/roles/ubuntu_base/tasks/base.yml @@ -14,11 +14,3 @@ apt: name: srvadmin-all when: not vagrant - -- name: Install necessary packages via pip - pip: - name: "{{ packages }}" - vars: - packages: - - docker - - docker-compose