From 5c06f04f695a672adf3f9f46b85f3c4d7605019d Mon Sep 17 00:00:00 2001
From: Tobias Trabelsi <lerentis@uploadfilter24.eu>
Date: Thu, 10 Feb 2022 15:53:05 +0100
Subject: [PATCH] removed centos 8 in favor of almalinux

---
 .drone.yml                           | 12 ++++++------
 README.md                            |  5 +++--
 {centos-8 => almalinux-8}/Dockerfile |  7 +++----
 build-all.sh                         |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename {centos-8 => almalinux-8}/Dockerfile (56%)

diff --git a/.drone.yml b/.drone.yml
index 0e7766d..92f5feb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -156,17 +156,17 @@ steps:
     - pull_request
     - cron
 
-- name: build-centos-8
+- name: build-almalinux-8
   image: plugins/kaniko
   settings:
-    dockerfile: centos-8/Dockerfile
+    dockerfile: almalinux-8/Dockerfile
     password:
       from_secret: docker_password
     username:
       from_secret: docker_username
     repo: lerentis/ansible
     tags: 
-      - centos-8-dev
+      - almalinux-8-dev
   when:
     event:
     - push
@@ -388,17 +388,17 @@ steps:
     event:
     - tag
 
-- name: build-centos-8-release
+- name: build-almalinux-8-release
   image: plugins/kaniko
   settings:
-    dockerfile: centos-8/Dockerfile
+    dockerfile: almalinux-8/Dockerfile
     password:
       from_secret: docker_password
     username:
       from_secret: docker_username
     repo: lerentis/ansible
     tags: 
-      - centos-8
+      - almalinux-8
   when:
     event:
     - tag
diff --git a/README.md b/README.md
index 87248c9..3cc972b 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,12 @@ Available operating systems:
 
 * alpine-3
 * centos-7
+* almalinux-8
 * debian-8
 * fedora-24
 * ubuntu-16.04
 * ubuntu-18.04
-* ubuntu-19.04
+* ubuntu-20.04
 * arch
 
 ## run playbooks
@@ -69,6 +70,6 @@ Note: /root/.ansible must not be an overlayfs, otherwise ssh accelerate won't wo
 
 ## references
 
-* [project](https://git.burntbunch.org/lerentis/ansible-container)
+* [project](https://git.uploadfilter24.eu/lerentis/ansible)
 
 Current Version: 0.7.2
diff --git a/centos-8/Dockerfile b/almalinux-8/Dockerfile
similarity index 56%
rename from centos-8/Dockerfile
rename to almalinux-8/Dockerfile
index d949bbe..3d0da4d 100644
--- a/centos-8/Dockerfile
+++ b/almalinux-8/Dockerfile
@@ -1,8 +1,7 @@
-FROM centos:8
+FROM almalinux:8
 
-RUN dnf -y install python3-pip &&\
-    dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm &&\
-    dnf install -y --enablerepo epel-playground ansible curl \
+RUN dnf -y install python3-pip epel-release \
+    && dnf install -y ansible curl \
     && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
     && chmod +rx /usr/local/bin/goss \
     && touch ~/.netrc && chmod og-rw ~/.netrc \
diff --git a/build-all.sh b/build-all.sh
index f5d0196..c35395c 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -8,5 +8,5 @@ cd ../debian-9 && docker buildx build -t lerentis/ansible:debian-9 --platform=li
 cd ../debian-8 && docker buildx build -t lerentis/ansible:debian-8 --platform=linux/arm,linux/amd64 . --push
 cd ../debian-10 && docker buildx build -t lerentis/ansible:debian-10 --platform=linux/arm64,linux/amd64 . --push
 cd ../centos-7 && docker buildx build -t lerentis/ansible:centos-7 --platform=linux/arm64,linux/amd64 . --push
-cd ../centos-8 && docker buildx build -t lerentis/ansible:centos-8 --platform=linux/arm64,linux/amd64 . --push
+cd ../almalinux-8 && docker buildx build -t lerentis/ansible:almalinux-8 --platform=linux/arm64,linux/amd64 . --push
 cd ../arch && docker buildx build -t lerentis/ansible:arch --platform=linux/arm,linux/amd64 . --push