Fedora Upgrade, CentOS Removal (#21)

Reviewed-on: #21 Co-authored-by: Chris Hammer <chris@thezengarden.net> Co-committed-by: Chris Hammer <chris@thezengarden.net>
2025-01-15 15:59:14 -05:00 · 2025-01-15 15:59:14 -05:00 · f7564b582e
commit f7564b582e
parent d232c25e22
6 changed files with 33 additions and 59 deletions
--- a/.gitea/workflows/build-release.yml
+++ b/.gitea/workflows/build-release.yml
@ -1,4 +1,4 @@
-name: Docker Build Pipeline
+name: Docker Image Build Pipeline

 on:
  push:
@ -6,22 +6,11 @@ on:
      - release

 jobs:
-  Cleanup-Old-Artifacts:
-    runs-on: self-hosted
-    defaults:
-      run:
-        working-directory: /home/builds/src
-
-    steps:
-      - name: Cleanup old code
-        run: rm -rfv *
-
-
  Check-Environment:
    runs-on: self-hosted
    defaults:
      run:
-        working-directory: /home/builds/src
+        working-directory: /home/builds/src/ansible-dev

    steps:
      - name: Environment check
@ -33,63 +22,48 @@ jobs:
          env && echo
          docker info && echo

-
-  Clone-Repo:
-    runs-on: self-hosted
-    defaults:
-      run:
-        working-directory: /home/builds/src
-
-    steps:
-      - name: Clone repository
-        run: |
-          git clone https://gitea.thezengarden.net/podman/ansible-dev.git
-          cd ansible-dev
-          git checkout ${{ env.GITHUB_REF_NAME }}
-
      - name: Verify current commit
-        run: cd ansible-dev && git log -1
+        run: |
+          git checkout ${{ env.GITHUB_REF_NAME }}
+          git log -1


  Build-Images:
    runs-on: self-hosted
+    needs: [Check-Environment]
    defaults:
      run:
        working-directory: /home/builds/src/ansible-dev

    steps:
-      - name: Build Fedora Image
+      - name: Fedora
        run: |
-          echo "docker build -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ."
-          docker build -f build/Containerfile.fedora39 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} .
+          echo "docker build -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ."
+          docker build -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} .

-      - name: Build CentOS Image
+      - name: Debian
        run: |
-          echo "docker build -f build/Containerfile.centos9 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} ."
-          docker build -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 -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} ."
-          docker build -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} .
+          echo "docker build -f build/Containerfile.debian -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} ."
+          docker build -f build/Containerfile.debian -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} .


  Push-Images:
    runs-on: self-hosted
+    needs: [Build-Images]
    steps:
      - name: Docker login
        run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}

-      - name: Push Registry Images
+      - name: Push images to registry
        run: |
          pwd
          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:
    runs-on: self-hosted
+    needs: [Build-Images, Push-Images]
    steps:
      - name: Cleanup build images
        run: docker system prune -af
@ -97,6 +71,7 @@ jobs:

  Cleanup-Docker-Login:
    runs-on: self-hosted
+    needs: [Push-Images]
    steps:
      - name: Cleanup Docker login
        run: rm -v /home/builds/.docker/config.json
--- a/.gitea/workflows/build-test.yml
+++ b/.gitea/workflows/build-test.yml
@ -1,4 +1,4 @@
-name: Docker Build Pipeline
+name: Docker Image Build Pipeline

 on:
  push:
@ -19,6 +19,7 @@ jobs:

  Check-Environment:
    runs-on: self-hosted
+    needs: [Cleanup-Old-Artifacts]
    defaults:
      run:
        working-directory: /home/builds/src
@ -36,6 +37,7 @@ jobs:

  Clone-Repo:
    runs-on: self-hosted
+    needs: [Check-Environment]
    defaults:
      run:
        working-directory: /home/builds/src
@ -53,54 +55,51 @@ jobs:

  Build-Images:
    runs-on: self-hosted
+    needs: [Check-Environment, Clone-Repo]
    defaults:
      run:
        working-directory: /home/builds/src/ansible-dev

    steps:
-      - name: Build Fedora Image
+      - name: Fedora
        run: |
-          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 }} .
+          echo "docker build --no-cache -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ."
+          docker build --no-cache -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} .

-      - name: Build CentOS Image
+      - name: Debian
        run: |
-          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 }} ."
-          docker build --no-cache -f build/Containerfile.debian12 -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} .
+          echo "docker build --no-cache -f build/Containerfile.debian -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} ."
+          docker build --no-cache -f build/Containerfile.debian -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} .


  Push-Images:
    runs-on: self-hosted
+    needs: [Build-Images]
    steps:
      - name: Docker login
        run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}

-      - name: Push Registry Images
+      - name: Push images to registry
        run: |
          pwd
          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:
    runs-on: self-hosted
+    needs: [Build-Images, Push-Images]
    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 }}


  Cleanup-Docker-Login:
    runs-on: self-hosted
+    needs: [Push-Images]
    steps:
      - name: Cleanup Docker login
        run: rm -v /home/builds/.docker/config.json
--- a/build/Containerfile.centos9
+++ b/build/Containerfile.centos9
--- a/build/Containerfile.debian12
+++ b/build/Containerfile.debian12
--- a/build/Containerfile.fedora39
+++ b/build/Containerfile.fedora39
@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:39
+FROM registry.fedoraproject.org/fedora:41
 LABEL maintainer="Chris Hammer (chris@thezengarden.net)"

 RUN rm /etc/localtime \
--- a/python/requirements.txt
+++ b/python/requirements.txt
@ -1,2 +1,2 @@
-ansible-core==2.15.9
-ansible-lint==6.22.2
+ansible-core==2.16.14
+ansible-lint==24.12.2