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] 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"]