From 63ca9dea19143f5cb252823ce8d45f680386f7eb Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Mon, 16 Dec 2024 17:54:37 -0500
Subject: [PATCH 1/4] Remove Debian 12; Re-name CentOS 9 build file

---
 .drone.yml                                    | 101 +-----------------
 ...e.centos-stream9 => Containerfile.centos9} |   0
 build/Containerfile.debian11                  |  21 ----
 3 files changed, 3 insertions(+), 119 deletions(-)
 rename build/{Containerfile.centos-stream9 => Containerfile.centos9} (100%)
 delete mode 100644 build/Containerfile.debian11

diff --git a/.drone.yml b/.drone.yml
index 4cc8311..a43abaf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -46,8 +46,8 @@ steps:
       BUILD_NAME     :
         from_secret: build_name_centos9
     commands:
-      - echo "docker build --no-cache -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
-      - docker build --no-cache -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
+      - echo "docker build --no-cache -f build/Containerfile.centos9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
+      - docker build --no-cache -f build/Containerfile.centos9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
       - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
       - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
 
@@ -89,7 +89,7 @@ steps:
       BUILD_NAME     :
         from_secret: build_name_centos9
     commands:
-      - docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH .
+      - docker build -f build/Containerfile.centos9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH .
       - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH
       - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
 
@@ -189,101 +189,6 @@ steps:
       - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
 
 
----
-####################
-# DEBIAN 11: TESTING
-####################
-kind: pipeline
-type: exec
-name: ansible_dev_debian11-test
-
-
-trigger:
-  branch:
-    - testing
-  event: [push]
-  status: [success]
-
-
-steps:
-  - name: check_environment
-    commands:
-      - hostnamectl
-      - env
-      - whoami
-      - pwd
-      - tree
-
-  - name: docker_info
-    commands:
-      - docker info
-
-  - name: docker_login
-    environment:
-      REGISTRY       : gitea.thezengarden.net
-      GITEA_USER     :
-        from_secret: gitea_user
-      GITEA_PASSWORD :
-        from_secret: gitea_password
-    commands:
-      - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_debian11
-    commands:
-      - echo "docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
-      - docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
----
-####################
-# DEBIAN 11: RELEASE
-####################
-kind: pipeline
-type: exec
-name: ansible_dev_debian11-rel
-
-
-trigger:
-  branch:
-    - release
-  event: [push]
-  status: [success]
-
-
-steps:
-  - name: docker_login
-    environment:
-      REGISTRY       : gitea.thezengarden.net
-      GITEA_USER     :
-        from_secret: gitea_user
-      GITEA_PASSWORD :
-        from_secret: gitea_password
-    commands:
-      - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY
-
-  - name: docker_build_and_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_debian11
-    commands:
-      - docker build -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH .
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
-
-
 ---
 ####################
 # DEBIAN 12: TESTING
diff --git a/build/Containerfile.centos-stream9 b/build/Containerfile.centos9
similarity index 100%
rename from build/Containerfile.centos-stream9
rename to build/Containerfile.centos9
diff --git a/build/Containerfile.debian11 b/build/Containerfile.debian11
deleted file mode 100644
index 03e041a..0000000
--- a/build/Containerfile.debian11
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM docker.io/debian:11
-LABEL maintainer="Chris Hammer (chris@thezengarden.net)"
-
-RUN rm /etc/localtime \
-    && ln -s /usr/share/zoneinfo/US/Eastern /etc/localtime
-
-RUN  mkdir -p /root/.ssh
-COPY conf/ssh_config /root/.ssh/config
-COPY conf/hosts /etc/hosts
-COPY python/requirements.txt /tmp/requirements.txt
-
-RUN apt update \
-    && apt dist-upgrade -y \
-    && apt autoremove --purge -y \
-    && apt install -y python3-pip git systemd nodejs \
-    && pip install pip --upgrade \
-    && pip install -r /tmp/requirements.txt
-
-COPY ansible/ansible-check.yml /tmp/ansible-check.yml
-
-CMD ["/bin/bash"]
-- 
2.47.1


From 97ca40a1d66728f965350647aabb9bad5d4df869 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Mon, 16 Dec 2024 17:58:11 -0500
Subject: [PATCH 2/4] Re-trigger CI

-- 
2.47.1


From 11ef01c4464b9458365afda35cf2c32bdd7e69d8 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Mon, 16 Dec 2024 18:11:30 -0500
Subject: [PATCH 3/4] Re-trigger CI - On the correct branch this time

-- 
2.47.1


From 13b84df2fdfdceb988c4bdfba05cae4d05d9eb85 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Tue, 17 Dec 2024 22:01:10 -0500
Subject: [PATCH 4/4] Update actions branch; tweaks to workflow

---
 .gitea/workflows/build-release.yml |  6 +-----
 .gitea/workflows/build-test.yml    | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml
index 42b95fb..6b55557 100644
--- a/.gitea/workflows/build-release.yml
+++ b/.gitea/workflows/build-release.yml
@@ -88,11 +88,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: Cleanup build images
-        run: |
-          pwd
-          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
-          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
-          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
+        run: docker system prune -af
 
 
   Cleanup-Docker-Login:
diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml
index 0f5a494..dfcbdbf 100644
--- a/.gitea/workflows/build-test.yml
+++ b/.gitea/workflows/build-test.yml
@@ -3,7 +3,7 @@ name: Docker Build Pipeline
 on:
   push:
     branches:
-      - gitea-actions
+      - testing
 
 jobs:
   Cleanup-Old-Artifacts:
@@ -56,18 +56,18 @@ jobs:
     steps:
       - name: Build Fedora Image
         run: |
-          echo "docker build --no-cache -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} ."
-          docker build --no-cache -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} .
+          echo "docker build --no-cache -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ."
+          docker build --no-cache -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} .
 
       - name: Build CentOS Image
         run: |
-          echo "docker build --no-cache -f build/Containerfile.centos9 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} ."
-          docker build --no-cache -f build/Containerfile.centos9 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} .
+          echo "docker build --no-cache -f build/Containerfile.centos9 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} ."
+          docker build --no-cache -f build/Containerfile.centos9 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} .
 
       - name: Build Debian Image
         run: |
-          echo "docker build --no-cache -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} ."
-          docker build --no-cache -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }} .
+          echo "docker build --no-cache -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} ."
+          docker build --no-cache -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} .
 
 
   Push-Images:
@@ -79,9 +79,9 @@ jobs:
       - name: Push Registry Images
         run: |
           pwd
-          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }}
-          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }}
-          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }}
+          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
+          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
+          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
 
 
   Cleanup-Build-Images:
@@ -90,9 +90,9 @@ jobs:
       - name: Cleanup build images
         run: |
           pwd
-          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }}
-          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }}
-          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}-${{ env.GITHUB_RUN_NUMBER }}
+          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
+          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }}
+          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
 
 
   Cleanup-Docker-Login:
-- 
2.47.1