From 5b2fa13ff3e285fb7ef37d4c96bd22fedfb18f35 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Thu, 12 Dec 2024 21:51:14 -0500
Subject: [PATCH] test actions 25

---
 .gitea/workflows/build.yml | 40 ++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 01fe0a5..bde58e2 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -16,12 +16,6 @@ jobs:
       - name: Cleanup old code
         run: rm -rfv *
 
-      - name: Clone repository
-        run: |
-          git clone https://gitea.thezengarden.net/podman/ansible-dev.git
-          cd ansible-dev
-          git checkout ${{ env.GITHUB_REF_NAME }}
-
       - name: Environment check
         run: |
           hostnamectl
@@ -30,51 +24,59 @@ jobs:
           pwd
           tree
 
-  Docker-Login:
+  Clone-Repository:
     runs-on: self-hosted
     defaults:
       run:
         working-directory: /home/builds/src
-
     steps:
-      - name: Docker login
-        run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}
+      - name: Clone repository
+        run: |
+          git clone ${{ GITHUB_SERVER_URL }}/${{ GITHUB_REPOSITORY }}.git
+          cd ${{ REPOSITORY_NAME }}
+          git checkout ${{ env.GITHUB_REF_NAME }}
 
   Build-Images:
     runs-on: self-hosted
     defaults:
       run:
-        working-directory: /home/builds/src/ansible-dev
+        working-directory: /home/builds/src/${{ REPOSITORY_NAME }}
 
     steps:
       - name: Build Fedora Docker Image
         run: |
-          pwd
           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 }} .
 
       - name: Build CentOS Docker Image
         run: |
-          pwd
           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 }} .
 
       - name: Build Debian Docker Image
         run: |
-          pwd
           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 }} .
 
   Push-Images:
     runs-on: self-hosted
-    defaults:
-      run:
-        working-directory: /home/builds/src/ansible-dev
-
     steps:
-      - name: Push Fedora Docker Image
+      - name: Docker login
+        run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}
+
+      - 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 }}
+
+  Cleanup-Build-Images:
+    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 }}-${{ 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 }}