From f7564b582e44fb9110feab75fd4f3e370a911db5 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 15:59:14 -0500 Subject: [PATCH] Fedora Upgrade, CentOS Removal (#21) Reviewed-on: https://gitea.thezengarden.net/podman/ansible-dev/pulls/21 Co-authored-by: Chris Hammer Co-committed-by: Chris Hammer --- .gitea/workflows/build-release.yml | 57 ++++++------------- .gitea/workflows/build-test.yml | 29 +++++----- ...ainerfile.centos9 => Containerfile.centos} | 0 ...inerfile.debian12 => Containerfile.debian} | 0 ...inerfile.fedora39 => Containerfile.fedora} | 2 +- python/requirements.txt | 4 +- 6 files changed, 33 insertions(+), 59 deletions(-) rename build/{Containerfile.centos9 => Containerfile.centos} (100%) rename build/{Containerfile.debian12 => Containerfile.debian} (100%) rename build/{Containerfile.fedora39 => Containerfile.fedora} (93%) diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 775afc3..d5cd8d0 100644 --- 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 diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index 60a2c6a..18f41b4 100644 --- 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 diff --git a/build/Containerfile.centos9 b/build/Containerfile.centos similarity index 100% rename from build/Containerfile.centos9 rename to build/Containerfile.centos diff --git a/build/Containerfile.debian12 b/build/Containerfile.debian similarity index 100% rename from build/Containerfile.debian12 rename to build/Containerfile.debian diff --git a/build/Containerfile.fedora39 b/build/Containerfile.fedora similarity index 93% rename from build/Containerfile.fedora39 rename to build/Containerfile.fedora index ca27c86..a09f756 100644 --- a/build/Containerfile.fedora39 +++ b/build/Containerfile.fedora @@ -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 \ diff --git a/python/requirements.txt b/python/requirements.txt index 64a8327..a7b5133 100644 --- 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