2024-12-21 23:38:20 -05:00
7 changed files with 411 additions and 52 deletions
--- a/.drone.yml.bak
+++ b/.drone.yml.bak
@ -0,0 +1,379 @@
+---
+##########################
+# CENTOS STREAM 9: TESTING
+##########################
+kind: pipeline
+type: exec
+name: ansible_dev_centos_stream9-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_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 .
+      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
+      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
+
+
+
+---
+##########################
+# CENTOS STREAM 9: RELEASE
+##########################
+kind: pipeline
+type: exec
+name: ansible_dev_centos_stream9-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_centos9
+    commands:
+      - docker build -f build/Containerfile.centos-stream9 -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"
+
+
+---
+####################
+# FEDORA 39: TESTING
+####################
+kind: pipeline
+type: exec
+name: ansible_dev_fedora39-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_fedora39
+    commands:
+      - echo "docker build --no-cache -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
+      - docker build --no-cache -f build/Containerfile.fedora39 -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"
+
+
+---
+####################
+# FEDORA 39: RELEASE
+####################
+kind: pipeline
+type: exec
+name: ansible_dev_fedora39-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_fedora39
+    commands:
+      - docker build -f build/Containerfile.fedora39 -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 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
+####################
+kind: pipeline
+type: exec
+name: ansible_dev_debian12-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_debian12
+    commands:
+      - echo "docker build --no-cache -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
+      - docker build --no-cache -f build/Containerfile.debian12 -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 12: RELEASE
+####################
+kind: pipeline
+type: exec
+name: ansible_dev_debian12-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_debian12
+    commands:
+      - docker build -f build/Containerfile.debian12 -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"
--- a/.gitea/workflows/build-release.yml
+++ b/.gitea/workflows/build-release.yml
@ -26,11 +26,12 @@ jobs:
    steps:
      - name: Environment check
        run: |
-          hostnamectl
-          env
-          whoami
-          pwd
-          tree
+          hostnamectl && echo
+          env && echo
+          whoami && echo
+          pwd && echo
+          tree && echo
+          git log -1 && echo


  Clone-Repo:
@ -88,11 +89,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:
--- 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:
@ -26,11 +26,12 @@ jobs:
    steps:
      - name: Environment check
        run: |
-          hostnamectl
-          env
-          whoami
-          pwd
-          tree
+          echo "BUILD_USER: $(whoami)" && echo
+          echo "PWD: $(pwd)" && echo
+          hostnamectl && echo
+          lscpu && echo
+          env && echo
+          docker info && echo


  Clone-Repo:
@ -46,6 +47,9 @@ jobs:
          cd ansible-dev
          git checkout ${{ env.GITHUB_REF_NAME }}

+      - name: Verify current commit
+        run: cd ansible-dev && git log -1
+

  Build-Images:
    runs-on: self-hosted
@ -56,18 +60,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 +83,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 +94,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:
--- a/build/Containerfile.centos9
+++ b/build/Containerfile.centos9
@ -12,7 +12,7 @@ COPY python/requirements.txt /tmp/requirements.txt

 # RUN dnf install -y python3-pip git ansible-core python3-ansible-lint
 RUN dnf update -y \
-    && dnf install -y python3-pip git systemd nodejs \
+    && dnf install -y python3-pip git systemd nodejs tree \
    && pip install pip --upgrade \
    && pip install -r /tmp/requirements.txt

--- a/build/Containerfile.debian11
+++ b/build/Containerfile.debian11
@ -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"]
--- a/build/Containerfile.debian12
+++ b/build/Containerfile.debian12
@ -12,7 +12,7 @@ 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 \
+    && apt install -y python3-pip git systemd nodejs tree \
    && pip install pip --upgrade --break-system-packages \
    && pip install -r /tmp/requirements.txt --break-system-packages

--- a/build/Containerfile.fedora39
+++ b/build/Containerfile.fedora39
@ -11,7 +11,7 @@ COPY conf/dnf.conf /etc/dnf/dnf.conf
 COPY python/requirements.txt /tmp/requirements.txt

 # RUN dnf install -y python3-pip git ansible-core python3-ansible-lint
-RUN dnf install -y python3-pip python3-devel gcc git systemd nodejs \
+RUN dnf install -y python3-pip python3-devel gcc git systemd nodejs tree \
  && pip install pip --upgrade \
  && pip install -r /tmp/requirements.txt