From 5bdc8bd686def6b0a27856d31d5e0ce07dd0dc6d Mon Sep 17 00:00:00 2001
From: gm <gunter.miegel@rgsqd.de>
Date: Mon, 3 Feb 2025 10:11:02 +0100
Subject: [PATCH] Updated list of supported and tested distros

Dropped EOL releases and added new LTS releases.
---
 README.md           |  6 +++---
 example/Vagrantfile | 28 ++++++++++++----------------
 example/tests.py    | 11 +++++------
 setup.py            |  2 +-
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 87075f5..761632b 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 A basic [pyinfra](https://pyinfra.com) deploy that installs and optionally configures Docker on the target hosts. Officially tested & supported Linux distributions:
 
-+ Ubuntu 16/18/20
-+ Debian 8/9/10
-+ CentOS 7/8
++ Ubuntu 20/22/24
++ Debian 11/12
++ Almalinux 9
 
 This deploy installs packages in the `docker-ce` ecosystem (`docker-ce`/`docker-ce-cli`/`docker-ce-rootless-extras`) You can specify `docker_version` in the host data and it will install that version for all `docker-ce` packages.
 
diff --git a/example/Vagrantfile b/example/Vagrantfile
index fc45585..76b2e2d 100644
--- a/example/Vagrantfile
+++ b/example/Vagrantfile
@@ -2,31 +2,27 @@ Vagrant.configure('2') do |config|
     # Disable /vagrant synced folder
     config.vm.synced_folder '.', '/vagrant', disabled: true
 
-    config.vm.define :ubuntu16 do |ubuntu|
-        ubuntu.vm.box = 'bento/ubuntu-16.04'
-    end
-
-    config.vm.define :ubuntu18 do |ubuntu|
-        ubuntu.vm.box = 'bento/ubuntu-18.04'
-    end
-
     config.vm.define :ubuntu20 do |ubuntu|
         ubuntu.vm.box = 'bento/ubuntu-20.04'
     end
 
-    config.vm.define :debian9 do |debian|
-        debian.vm.box = 'bento/debian-9.11'
+    config.vm.define :ubuntu22 do |ubuntu|
+        ubuntu.vm.box = 'bento/ubuntu-22.04'
+    end
+
+    config.vm.define :ubuntu24 do |ubuntu|
+        ubuntu.vm.box = 'bento/ubuntu-24.04'
     end
 
-    config.vm.define :debian10 do |debian|
-        debian.vm.box = 'bento/debian-10'
+    config.vm.define :debian11 do |debian|
+        debian.vm.box = 'bento/debian-11'
     end
 
-    config.vm.define :centos7 do |centos|
-        centos.vm.box = 'bento/centos-7'
+    config.vm.define :debian12 do |debian|
+        debian.vm.box = 'bento/debian-12'
     end
 
-    config.vm.define :almalinux8 do |almalinux|
-        almalinux.vm.box = 'bento/almalinux-8'
+    config.vm.define :almalinux9 do |almalinux|
+        almalinux.vm.box = 'bento/almalinux-9'
     end
 end
diff --git a/example/tests.py b/example/tests.py
index e39cd40..60690e3 100644
--- a/example/tests.py
+++ b/example/tests.py
@@ -1,11 +1,10 @@
 testinfra_hosts = [
-    "ssh://ubuntu16",
-    "ssh://ubuntu18",
     "ssh://ubuntu20",
-    "ssh://debian9",
-    "ssh://debian10",
-    "ssh://centos7",
-    "ssh://almalinux8",
+    "ssh://ubuntu22",
+    "ssh://ubuntu24",
+    "ssh://debian11",
+    "ssh://debian12",
+    "ssh://almalinux9",
 ]
 
 
diff --git a/setup.py b/setup.py
index 86c9e4a..8646e9b 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 
 if __name__ == "__main__":
     setup(
-        version="2.1",
+        version="2.2",
         name="pyinfra-docker",
         description="Install & configure Docker with `pyinfra`.",
         long_description=readme,