From 63ca9dea19143f5cb252823ce8d45f680386f7eb Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Mon, 16 Dec 2024 17:54:37 -0500 Subject: [PATCH 01/12] Remove Debian 12; Re-name CentOS 9 build file --- .drone.yml | 101 +----------------- ...e.centos-stream9 => Containerfile.centos9} | 0 build/Containerfile.debian11 | 21 ---- 3 files changed, 3 insertions(+), 119 deletions(-) rename build/{Containerfile.centos-stream9 => Containerfile.centos9} (100%) delete mode 100644 build/Containerfile.debian11 diff --git a/.drone.yml b/.drone.yml index 4cc8311..a43abaf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,8 +46,8 @@ steps: 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 . + - echo "docker build --no-cache -f build/Containerfile.centos9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ." + - docker build --no-cache -f build/Containerfile.centos9 -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" @@ -89,7 +89,7 @@ steps: 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 build -f build/Containerfile.centos9 -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" @@ -189,101 +189,6 @@ steps: - 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 diff --git a/build/Containerfile.centos-stream9 b/build/Containerfile.centos9 similarity index 100% rename from build/Containerfile.centos-stream9 rename to build/Containerfile.centos9 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"] From 97ca40a1d66728f965350647aabb9bad5d4df869 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Mon, 16 Dec 2024 17:58:11 -0500 Subject: [PATCH 02/12] Re-trigger CI From 11ef01c4464b9458365afda35cf2c32bdd7e69d8 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Mon, 16 Dec 2024 18:11:30 -0500 Subject: [PATCH 03/12] Re-trigger CI - On the correct branch this time From 13b84df2fdfdceb988c4bdfba05cae4d05d9eb85 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Tue, 17 Dec 2024 22:01:10 -0500 Subject: [PATCH 04/12] Update actions branch; tweaks to workflow --- .gitea/workflows/build-release.yml | 6 +----- .gitea/workflows/build-test.yml | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 18 deletions(-) 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: From 409151358538074fd1e75e570a9a0bfe4a1dc10a Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 21 Dec 2024 22:52:45 -0500 Subject: [PATCH 05/12] Trying different way of cloning; updates to cmds --- .gitea/workflows/build-release.yml | 11 ++++++----- .gitea/workflows/build-test.yml | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) 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..4e22b88 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 + hostnamectl && echo + env && echo + whoami && echo + pwd && echo + tree && echo + git log -1 && echo Clone-Repo: @@ -41,10 +42,12 @@ jobs: steps: - name: Clone repository - run: | - git clone https://gitea.thezengarden.net/podman/ansible-dev.git - cd ansible-dev - git checkout ${{ env.GITHUB_REF_NAME }} + uses: actions/checkout@v3 + # - name: Clone repository + # run: | + # git clone https://gitea.thezengarden.net/podman/ansible-dev.git + # cd ansible-dev + # git checkout ${{ env.GITHUB_REF_NAME }} Build-Images: From 4f1f2efa172060b816c81ff6373ca26796bc483e Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 21 Dec 2024 22:53:53 -0500 Subject: [PATCH 06/12] Trying different way of cloning; updates to cmds 2 --- .gitea/workflows/build-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index 4e22b88..6ff5a8e 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -31,7 +31,6 @@ jobs: whoami && echo pwd && echo tree && echo - git log -1 && echo Clone-Repo: From 9a2831b17e3025f3d26cf9a4e54989d3e1e6ae8e Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 21 Dec 2024 22:54:59 -0500 Subject: [PATCH 07/12] Revert clone method; updates --- .gitea/workflows/build-test.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index 6ff5a8e..fb09d86 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -41,12 +41,13 @@ jobs: steps: - name: Clone repository - uses: actions/checkout@v3 - # - name: Clone repository - # run: | - # git clone https://gitea.thezengarden.net/podman/ansible-dev.git - # cd ansible-dev - # git checkout ${{ env.GITHUB_REF_NAME }} + run: | + git clone https://gitea.thezengarden.net/podman/ansible-dev.git + cd ansible-dev + git checkout ${{ env.GITHUB_REF_NAME }} + + - name: Verify commit + run: git log -1 Build-Images: From 39ce63a24408a622a650653ca6e30c7b1adeaf16 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 21 Dec 2024 22:56:14 -0500 Subject: [PATCH 08/12] Revert clone method; updates 2 --- .gitea/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index fb09d86..8cb7ad5 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -47,7 +47,7 @@ jobs: git checkout ${{ env.GITHUB_REF_NAME }} - name: Verify commit - run: git log -1 + run: cd ansible-dev && git log -1 Build-Images: From c0fdbcf84a1936e321b77b432e7df0177f47f610 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 21 Dec 2024 23:21:10 -0500 Subject: [PATCH 09/12] Updates --- .drone.yml.bak | 379 ++++++++++++++++++++++++++++++++ .gitea/workflows/build-test.yml | 9 +- 2 files changed, 384 insertions(+), 4 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-test.yml b/.gitea/workflows/build-test.yml index 8cb7ad5..60a2c6a 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -26,11 +26,12 @@ jobs: steps: - name: Environment check run: | + echo "BUILD_USER: $(whoami)" && echo + echo "PWD: $(pwd)" && echo hostnamectl && echo + lscpu && echo env && echo - whoami && echo - pwd && echo - tree && echo + docker info && echo Clone-Repo: @@ -46,7 +47,7 @@ jobs: cd ansible-dev git checkout ${{ env.GITHUB_REF_NAME }} - - name: Verify commit + - name: Verify current commit run: cd ansible-dev && git log -1 From 8938014ddb8bebd3a3e270df60e15c1837922441 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 21 Dec 2024 23:23:35 -0500 Subject: [PATCH 10/12] Add `tree` to the container builds --- build/Containerfile.centos9 | 2 +- build/Containerfile.debian12 | 2 +- build/Containerfile.fedora39 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 From fb48374b70fd5cc78baba0f1a833d643bb00191e Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 01:17:28 -0500 Subject: [PATCH 11/12] Add procps(-ng) --- build/Containerfile.centos9 | 2 +- build/Containerfile.debian12 | 2 +- build/Containerfile.fedora39 | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/Containerfile.centos9 b/build/Containerfile.centos9 index 6158745..5002972 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 tree \ + && dnf install -y python3-pip python3-devel gcc git systemd nodejs tree procps-ng \ && pip install pip --upgrade \ && pip install -r /tmp/requirements.txt diff --git a/build/Containerfile.debian12 b/build/Containerfile.debian12 index 4991216..16e8f6d 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 tree \ + && apt install -y python3-pip git systemd nodejs tree procps \ && 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 0d9c1b8..ca27c86 100644 --- a/build/Containerfile.fedora39 +++ b/build/Containerfile.fedora39 @@ -11,9 +11,10 @@ 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 tree \ - && pip install pip --upgrade \ - && pip install -r /tmp/requirements.txt +RUN dnf update -y \ + && dnf install -y python3-pip python3-devel gcc git systemd nodejs tree procps-ng \ + && pip install pip --upgrade \ + && pip install -r /tmp/requirements.txt COPY ansible/ansible-check.yml /tmp/ansible-check.yml From 20bc8d7e3210e403c39f9d6e2fad65f8bc96f76f Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 11:07:33 -0500 Subject: [PATCH 12/12] Fix build-release.yml --- .gitea/workflows/build-release.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 32033af..775afc3 100644 --- a/.gitea/workflows/build-release.yml +++ b/.gitea/workflows/build-release.yml @@ -26,12 +26,12 @@ jobs: steps: - name: Environment check run: | + echo "BUILD_USER: $(whoami)" && echo + echo "PWD: $(pwd)" && echo hostnamectl && echo + lscpu && echo env && echo - whoami && echo - pwd && echo - tree && echo - git log -1 && echo + docker info && echo Clone-Repo: @@ -47,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