From d4f960561eb5c5c71e6e6aa38ca008eae6f82e82 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 15:00:36 -0500 Subject: [PATCH 1/5] Update ansible-core/ansible-lint versions --- python/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.47.1 From b36db3b0bf78ab13b86e145dea98a7c156485b70 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 15:28:15 -0500 Subject: [PATCH 2/5] Revert ansible-core version due to CentOS 9; Need a solution for this... --- .gitea/workflows/build-test.yml | 6 ++++++ build/{Containerfile.fedora39 => Containerfile.fedora41} | 2 +- python/requirements.txt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) rename build/{Containerfile.fedora39 => Containerfile.fedora41} (93%) diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index 60a2c6a..a992a29 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -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,6 +55,7 @@ jobs: Build-Images: runs-on: self-hosted + needs: [Check-Environment, Clone-Repo] defaults: run: working-directory: /home/builds/src/ansible-dev @@ -76,6 +79,7 @@ jobs: 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 }} @@ -90,6 +94,7 @@ jobs: Cleanup-Build-Images: runs-on: self-hosted + needs: [Build-Images, Push-Images] steps: - name: Cleanup build images run: | @@ -101,6 +106,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/build/Containerfile.fedora39 b/build/Containerfile.fedora41 similarity index 93% rename from build/Containerfile.fedora39 rename to build/Containerfile.fedora41 index ca27c86..a09f756 100644 --- a/build/Containerfile.fedora39 +++ b/build/Containerfile.fedora41 @@ -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 a7b5133..1cb2001 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,2 +1,2 @@ -ansible-core==2.16.14 +ansible-core==2.15.13 ansible-lint==24.12.2 -- 2.47.1 From ca736a6f3eda1eba0eb066af6cc08777332ee323 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 15:31:08 -0500 Subject: [PATCH 3/5] Fix build files; Update action vars --- .gitea/workflows/build-release.yml | 12 ++++++------ .gitea/workflows/build-test.yml | 12 ++++++------ .../{Containerfile.centos9 => Containerfile.centos} | 0 .../{Containerfile.debian12 => Containerfile.debian} | 0 .../{Containerfile.fedora41 => Containerfile.fedora} | 0 5 files changed, 12 insertions(+), 12 deletions(-) rename build/{Containerfile.centos9 => Containerfile.centos} (100%) rename build/{Containerfile.debian12 => Containerfile.debian} (100%) rename build/{Containerfile.fedora41 => Containerfile.fedora} (100%) diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 775afc3..1cd46fd 100644 --- a/.gitea/workflows/build-release.yml +++ b/.gitea/workflows/build-release.yml @@ -60,18 +60,18 @@ jobs: steps: - name: Build Fedora Image 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 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 }} . + echo "docker build -f build/Containerfile.centos -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} ." + docker build -f build/Containerfile.centos -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: diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index a992a29..cffa4f4 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -63,18 +63,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 }} ." - 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 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 }} . + echo "docker build --no-cache -f build/Containerfile.centos -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} ." + docker build --no-cache -f build/Containerfile.centos -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: 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.fedora41 b/build/Containerfile.fedora similarity index 100% rename from build/Containerfile.fedora41 rename to build/Containerfile.fedora -- 2.47.1 From 36526ba6319d5819c977b8e29cf4575dc1d53746 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 15:41:10 -0500 Subject: [PATCH 4/5] Get rid of CentOS 9; More build file stuff --- .gitea/workflows/build-release.yml | 35 ++++++++++-------------------- .gitea/workflows/build-test.yml | 13 +++-------- python/requirements.txt | 2 +- 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 1cd46fd..22b8a46 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: @@ -19,6 +19,7 @@ jobs: Check-Environment: runs-on: self-hosted + needs: [Cleanup-Old-Artifacts] defaults: run: working-directory: /home/builds/src @@ -34,40 +35,24 @@ jobs: 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 - - Build-Images: runs-on: self-hosted + needs: [Check-Environment] defaults: run: working-directory: /home/builds/src/ansible-dev steps: + - name: Verify current commit + run: | + git checkout ${{ env.GITHUB_REF_NAME }} + git log -1 + - name: Build Fedora Image run: | 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 - run: | - echo "docker build -f build/Containerfile.centos -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} ." - docker build -f build/Containerfile.centos -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.debian -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} ." @@ -76,6 +61,7 @@ jobs: 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 }} @@ -84,12 +70,12 @@ jobs: 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 +83,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 cffa4f4..16f3e31 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: @@ -61,17 +61,12 @@ jobs: working-directory: /home/builds/src/ansible-dev steps: - - name: Build Fedora Image + - name: Fedora run: | 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 - run: | - echo "docker build --no-cache -f build/Containerfile.centos -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} ." - docker build --no-cache -f build/Containerfile.centos -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_CENTOS }}:${{ env.GITHUB_REF_NAME }} . - - - name: Build Debian Image + - name: Debian run: | 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 }} . @@ -88,7 +83,6 @@ jobs: 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 }} @@ -100,7 +94,6 @@ jobs: 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 }} diff --git a/python/requirements.txt b/python/requirements.txt index 1cb2001..a7b5133 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,2 +1,2 @@ -ansible-core==2.15.13 +ansible-core==2.16.14 ansible-lint==24.12.2 -- 2.47.1 From 026977bf276e412897dd7e0236fdf721654aa535 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 15:52:08 -0500 Subject: [PATCH 5/5] Tweaks --- .gitea/workflows/build-release.yml | 30 +++++++++--------------------- .gitea/workflows/build-test.yml | 2 +- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 22b8a46..d5cd8d0 100644 --- a/.gitea/workflows/build-release.yml +++ b/.gitea/workflows/build-release.yml @@ -6,23 +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 - needs: [Cleanup-Old-Artifacts] defaults: run: - working-directory: /home/builds/src + working-directory: /home/builds/src/ansible-dev steps: - name: Environment check @@ -34,6 +22,11 @@ jobs: env && echo docker info && echo + - name: Verify current commit + run: | + git checkout ${{ env.GITHUB_REF_NAME }} + git log -1 + Build-Images: runs-on: self-hosted @@ -43,17 +36,12 @@ jobs: working-directory: /home/builds/src/ansible-dev steps: - - name: Verify current commit - run: | - git checkout ${{ env.GITHUB_REF_NAME }} - git log -1 - - - name: Build Fedora Image + - name: Fedora run: | 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 Debian Image + - name: Debian run: | 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 }} . @@ -66,7 +54,7 @@ jobs: - 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 }} diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index 16f3e31..18f41b4 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -79,7 +79,7 @@ jobs: - 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 }} -- 2.47.1