From 107744cab5450b316b9968e85289d8f03af14532 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Tue, 17 Dec 2024 22:10:48 -0500 Subject: [PATCH 1/3] Updates (#14) Reviewed-on: https://gitea.thezengarden.net/podman/ansible-dev/pulls/14 Co-authored-by: Chris Hammer Co-committed-by: Chris Hammer --- .gitea/workflows/build-release.yml | 6 +----- .gitea/workflows/build-test.yml | 26 +++++++++++++------------- build/Containerfile.debian11 | 21 --------------------- 3 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 build/Containerfile.debian11 diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 42b95fb..6b55557 100644 --- a/.gitea/workflows/build-release.yml +++ b/.gitea/workflows/build-release.yml @@ -88,11 +88,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: diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index 0f5a494..dfcbdbf 100644 --- 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: @@ -56,18 +56,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 +79,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 +90,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: diff --git a/build/Containerfile.debian11 b/build/Containerfile.debian11 deleted file mode 100644 index 03e041a..0000000 --- a/build/Containerfile.debian11 +++ /dev/null @@ -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"] -- 2.47.1 From 41295efee2adfbb3fadde65de3b022961e765749 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 21 Dec 2024 23:38:19 -0500 Subject: [PATCH 2/3] Add `tree` (#15) Reviewed-on: https://gitea.thezengarden.net/podman/ansible-dev/pulls/15 Co-authored-by: Chris Hammer Co-committed-by: Chris Hammer --- .drone.yml.bak | 379 +++++++++++++++++++++++++++++ .gitea/workflows/build-release.yml | 11 +- .gitea/workflows/build-test.yml | 14 +- build/Containerfile.centos9 | 2 +- build/Containerfile.debian12 | 2 +- build/Containerfile.fedora39 | 2 +- 6 files changed, 397 insertions(+), 13 deletions(-) create mode 100644 .drone.yml.bak diff --git a/.drone.yml.bak b/.drone.yml.bak new file mode 100644 index 0000000..4cc8311 --- /dev/null +++ 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" diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 6b55557..32033af 100644 --- 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: diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index dfcbdbf..60a2c6a 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -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 diff --git a/build/Containerfile.centos9 b/build/Containerfile.centos9 index af54138..6158745 100644 --- 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 diff --git a/build/Containerfile.debian12 b/build/Containerfile.debian12 index 9e57f54..4991216 100644 --- 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 diff --git a/build/Containerfile.fedora39 b/build/Containerfile.fedora39 index 3a425c3..0d9c1b8 100644 --- 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 -- 2.47.1 From f7564b582e44fb9110feab75fd4f3e370a911db5 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 15:59:14 -0500 Subject: [PATCH 3/3] 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 -- 2.47.1