From ed1de63b9fdab7d386eb50b718eeb05624c5433f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Thu, 1 Jun 2023 13:39:57 +0200
Subject: [PATCH] [UPD] remove docker-compose, use official package instead
---
README.md | 1 -
tasks/main.yml | 7 -------
vars/Debian.yml | 15 ++++++++-------
vars/RedHat.yml | 13 ++++++-------
vars/main.yml | 3 ---
5 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index 5d92029..eaf1dcd 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,6 @@ Variables from vars directory:
* packages_to_remove : list of packages that we want to remove from default delivered servers
* packages_to_install : list of packages to install on server
* Global (main.yml):
- * pip_packages: Python pip packages to be installed / upgraded
* timezone: for Traefik logs (defaults to "Europe/Paris")
* traefik_version: "v2.9.6"
diff --git a/tasks/main.yml b/tasks/main.yml
index 2717382..58dc36b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -59,13 +59,6 @@
state: latest
when: ansible_check_mode
-- name: Update pip
- pip:
- name: ['{{ item }}']
- executable: pip3
- state: latest
- with_items: "{{ pip_packages }}"
-
- name: Create /etc/docker repo
file:
name: /etc/docker
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 1f4651c..665e918 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,18 +1,19 @@
---
packages_to_remove:
- containerd
- - docker
- - docker-engine
+ - docker-compose
+ - docker-doc
- docker.io
+ - podman-docker
- runc
packages_to_install:
- build-essential
- ca-certificates
- curl
+ - containerd.io
+ - docker-buildx-plugin
- docker-ce
+ - docker-ce-cli
+ - docker-compose-plugin
- git
- - python3-dev
- - python3-docker
- - python3-pip
- - python3-setuptools
- - software-properties-common
+ - gnupg
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 191baf6..1f17e31 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -8,12 +8,11 @@ packages_to_remove:
- docker-latest
- docker-latest-logrotate
- docker-logrotate
+ - podman
+ - runc
packages_to_install:
- - device-mapper-persistent-data
+ - containerd.io
+ - docker-buildx-plugin
- docker-ce
- - gcc
- - lvm2
- - python3-devel
- - python3-docker
- - python3-pip
- - python3-setuptools
+ - docker-ce-cli
+ - docker-compose-plugin
diff --git a/vars/main.yml b/vars/main.yml
index e5dffd0..282afff 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,6 +1,3 @@
---
-pip_packages:
- - pip
- - docker_compose
timezone: "Europe/Paris"
traefik_version: "v2.10"
--
GitLab