From 4aac45b57fbb9f6b82df41a80dee87d998631f88 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 16:40:54 -0500 Subject: [PATCH 1/9] Updates to release build file --- .gitea/workflows/build-release.yml | 42 ++++-------------------------- 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 5ecc2b3..2bac5d6 100644 --- a/.gitea/workflows/build-release.yml +++ b/.gitea/workflows/build-release.yml @@ -6,56 +6,24 @@ on: - release jobs: - Cleanup-Old-Artifacts: + Checkout-Branch: runs-on: self-hosted defaults: run: - working-directory: /home/builds/src + working-directory: /home/builds/src/ansible-dev 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 - - steps: - - name: Environment check + - name: Checkout release branch run: | - echo "BUILD_USER: $(whoami)" && echo - echo "PWD: $(pwd)" && echo - hostnamectl && echo - lscpu && echo - env && echo - docker info && echo - - - Clone-Repo: - runs-on: self-hosted - needs: [Check-Environment] - 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 log -1 Build-Images: runs-on: self-hosted - needs: [Check-Environment] + needs: [Checkout-Branch] defaults: run: working-directory: /home/builds/src/ansible-dev From 74e029b155b148229d4a32d0b0a55623697b7316 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 16:43:21 -0500 Subject: [PATCH 2/9] Add staging CI file for testing releases --- .gitea/workflows/build-stage.yml | 73 ++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .gitea/workflows/build-stage.yml diff --git a/.gitea/workflows/build-stage.yml b/.gitea/workflows/build-stage.yml new file mode 100644 index 0000000..a65f856 --- /dev/null +++ b/.gitea/workflows/build-stage.yml @@ -0,0 +1,73 @@ +name: Docker Image Build Pipeline + +on: + push: + branches: + - staging + +jobs: + Checkout-Branch: + runs-on: self-hosted + defaults: + run: + working-directory: /home/builds/src/ansible-dev + + steps: + - name: Checkout staging branch + run: | + git checkout ${{ env.GITHUB_REF_NAME }} + + - name: Verify current commit + run: git log -1 + + + Build-Images: + runs-on: self-hosted + needs: [Checkout-Branch] + defaults: + run: + working-directory: /home/builds/src/ansible-dev + + steps: + - 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: 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 }} . + + + 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 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_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_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 From 248c228ebbadaf1221673703fd153d31f2710262 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 16:52:43 -0500 Subject: [PATCH 3/9] Update build-stage.yml --- .gitea/workflows/build-stage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build-stage.yml b/.gitea/workflows/build-stage.yml index a65f856..cfe911b 100644 --- a/.gitea/workflows/build-stage.yml +++ b/.gitea/workflows/build-stage.yml @@ -15,6 +15,7 @@ jobs: steps: - name: Checkout staging branch run: | + git fetch origin ${{ env.GITHUB_REF_NAME }}:${{ env.GITHUB_REF_NAME }} git checkout ${{ env.GITHUB_REF_NAME }} - name: Verify current commit From 78739dfb8f3317a5641398ed9675b8d3b9df6846 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 17:41:04 -0500 Subject: [PATCH 4/9] Updates to CI workflow --- .gitea/workflows/build-release.yml | 70 ------------------- ...uild-stage.yml => build-stage-release.yml} | 4 +- .gitea/workflows/build-test.yml | 3 + 3 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 .gitea/workflows/build-release.yml rename .gitea/workflows/{build-stage.yml => build-stage-release.yml} (96%) diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml deleted file mode 100644 index 2bac5d6..0000000 --- a/.gitea/workflows/build-release.yml +++ /dev/null @@ -1,70 +0,0 @@ -name: Docker Image Build Pipeline - -on: - push: - branches: - - release - -jobs: - Checkout-Branch: - runs-on: self-hosted - defaults: - run: - working-directory: /home/builds/src/ansible-dev - - steps: - - name: Checkout release branch - run: | - git checkout ${{ env.GITHUB_REF_NAME }} - - - name: Verify current commit - run: git log -1 - - - Build-Images: - runs-on: self-hosted - needs: [Checkout-Branch] - defaults: - run: - working-directory: /home/builds/src/ansible-dev - - steps: - - 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: 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 }} . - - - 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 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_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 - - - 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-stage.yml b/.gitea/workflows/build-stage-release.yml similarity index 96% rename from .gitea/workflows/build-stage.yml rename to .gitea/workflows/build-stage-release.yml index cfe911b..5c944f6 100644 --- a/.gitea/workflows/build-stage.yml +++ b/.gitea/workflows/build-stage-release.yml @@ -3,7 +3,7 @@ name: Docker Image Build Pipeline on: push: branches: - - staging + - staging,release jobs: Checkout-Branch: @@ -13,7 +13,7 @@ jobs: working-directory: /home/builds/src/ansible-dev steps: - - name: Checkout staging branch + - name: "Checkout branch: ${{ env.GITHUB_REF_NAME }}" run: | git fetch origin ${{ env.GITHUB_REF_NAME }}:${{ env.GITHUB_REF_NAME }} git checkout ${{ env.GITHUB_REF_NAME }} diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index 18f41b4..2bbb6b4 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -16,6 +16,9 @@ jobs: - name: Cleanup old code run: rm -rfv * + - name: Cleanup old build cache + run: docker system prune -af + Check-Environment: runs-on: self-hosted From e247105e3f0adb6944da3f8cc72dcae0f0b96025 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 15 Jan 2025 17:53:50 -0500 Subject: [PATCH 5/9] Updates to CI workflow --- .gitea/workflows/{build-stage-release.yml => build-release.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .gitea/workflows/{build-stage-release.yml => build-release.yml} (99%) diff --git a/.gitea/workflows/build-stage-release.yml b/.gitea/workflows/build-release.yml similarity index 99% rename from .gitea/workflows/build-stage-release.yml rename to .gitea/workflows/build-release.yml index 5c944f6..e120d18 100644 --- a/.gitea/workflows/build-stage-release.yml +++ b/.gitea/workflows/build-release.yml @@ -3,7 +3,7 @@ name: Docker Image Build Pipeline on: push: branches: - - staging,release + - release jobs: Checkout-Branch: From 7b5e144cfaf52dd2e4bc8cac4cf1465f9d135b66 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 13 Aug 2025 15:07:31 -0400 Subject: [PATCH 6/9] Updates to bring us up-to-date --- .gitea/workflows/build-release.yml | 10 +++++----- .gitea/workflows/build-test.yml | 24 ++++++++++++------------ README.md | 3 +++ build/Containerfile.centos | 3 ++- build/Containerfile.debian | 1 + build/Containerfile.fedora | 3 ++- python/requirements-centos.txt | 2 ++ scripts/build_images.sh | 4 ++++ 8 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 README.md create mode 100644 python/requirements-centos.txt create mode 100755 scripts/build_images.sh diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index e120d18..4b6c90c 100644 --- a/.gitea/workflows/build-release.yml +++ b/.gitea/workflows/build-release.yml @@ -13,12 +13,12 @@ jobs: working-directory: /home/builds/src/ansible-dev steps: - - name: "Checkout branch: ${{ env.GITHUB_REF_NAME }}" + - name: "Checkout Branch: ${{ env.GITHUB_REF_NAME }}" run: | git fetch origin ${{ env.GITHUB_REF_NAME }}:${{ env.GITHUB_REF_NAME }} git checkout ${{ env.GITHUB_REF_NAME }} - - name: Verify current commit + - name: Verify Current Commit run: git log -1 @@ -45,10 +45,10 @@ jobs: runs-on: self-hosted needs: [Build-Images] steps: - - name: Docker login + - name: Docker Login run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }} - - name: Push images to registry + - name: Push Images to Registry run: | pwd docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} @@ -59,7 +59,7 @@ jobs: runs-on: self-hosted needs: [Build-Images, Push-Images] steps: - - name: Cleanup build images + - name: Cleanup Build Images run: | pwd docker rmi ${{ 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 2bbb6b4..935e350 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -6,29 +6,29 @@ on: - testing jobs: - Cleanup-Old-Artifacts: + Clean-Stale-Artifacts: runs-on: self-hosted defaults: run: working-directory: /home/builds/src steps: - - name: Cleanup old code + - name: Cleanup Stale Artifacts run: rm -rfv * - - name: Cleanup old build cache + - name: Cleanup Build Cache run: docker system prune -af Check-Environment: runs-on: self-hosted - needs: [Cleanup-Old-Artifacts] + needs: [Clean-Stale-Artifacts] defaults: run: working-directory: /home/builds/src steps: - - name: Environment check + - name: Environment Check run: | echo "BUILD_USER: $(whoami)" && echo echo "PWD: $(pwd)" && echo @@ -46,13 +46,13 @@ jobs: working-directory: /home/builds/src steps: - - name: Clone repository + - name: Clone Repository run: | - git clone https://gitea.thezengarden.net/podman/ansible-dev.git + git clone ${{ vars.GITHUB_SERVER_URL }}/${{ vars.GITHUB_REPOSITORY }} cd ansible-dev git checkout ${{ env.GITHUB_REF_NAME }} - - name: Verify current commit + - name: Verify Current Commit run: cd ansible-dev && git log -1 @@ -79,10 +79,10 @@ jobs: runs-on: self-hosted needs: [Build-Images] steps: - - name: Docker login + - name: Docker Login run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }} - - name: Push images to registry + - name: Push Images to Registry run: | pwd docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} @@ -93,7 +93,7 @@ jobs: runs-on: self-hosted needs: [Build-Images, Push-Images] steps: - - name: Cleanup build images + - name: Cleanup Build Images run: | pwd docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} @@ -104,5 +104,5 @@ jobs: runs-on: self-hosted needs: [Push-Images] steps: - - name: Cleanup Docker login + - name: Cleanup Docker Login run: rm -v /home/builds/.docker/config.json diff --git a/README.md b/README.md new file mode 100644 index 0000000..ddaaa16 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +Build Status: ![Build status](https://gitea.thezengarden.net/podman/ansible-dev/actions/workflows/build-test.yml/badge.svg?branch=testing&style=flat) + +This provides the framework for testing in our environment. diff --git a/build/Containerfile.centos b/build/Containerfile.centos index 5002972..9c40c95 100644 --- a/build/Containerfile.centos +++ b/build/Containerfile.centos @@ -8,7 +8,7 @@ RUN mkdir -p /root/.ssh COPY conf/ssh_config /root/.ssh/config COPY conf/hosts /etc/hosts COPY conf/dnf.conf /etc/dnf/dnf.conf -COPY python/requirements.txt /tmp/requirements.txt +COPY python/requirements-centos.txt /tmp/requirements.txt # RUN dnf install -y python3-pip git ansible-core python3-ansible-lint RUN dnf update -y \ @@ -18,4 +18,5 @@ RUN dnf update -y \ COPY ansible/ansible-check.yml /tmp/ansible-check.yml +WORKDIR /root CMD ["/bin/bash"] diff --git a/build/Containerfile.debian b/build/Containerfile.debian index 16e8f6d..febc0a4 100644 --- a/build/Containerfile.debian +++ b/build/Containerfile.debian @@ -18,4 +18,5 @@ RUN apt update \ COPY ansible/ansible-check.yml /tmp/ansible-check.yml +WORKDIR /root CMD ["/bin/bash"] diff --git a/build/Containerfile.fedora b/build/Containerfile.fedora index a09f756..583ce77 100644 --- a/build/Containerfile.fedora +++ b/build/Containerfile.fedora @@ -12,10 +12,11 @@ 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 python3-devel gcc git systemd nodejs tree procps-ng \ + && dnf install -y python3-pip python3-devel gcc git systemd nodejs tree procps-ng python3-libdnf5 \ && pip install pip --upgrade \ && pip install -r /tmp/requirements.txt COPY ansible/ansible-check.yml /tmp/ansible-check.yml +WORKDIR /root CMD ["/bin/bash"] diff --git a/python/requirements-centos.txt b/python/requirements-centos.txt new file mode 100644 index 0000000..281a01b --- /dev/null +++ b/python/requirements-centos.txt @@ -0,0 +1,2 @@ +ansible-core==2.14.18 +ansible-lint==6.22.2 diff --git a/scripts/build_images.sh b/scripts/build_images.sh new file mode 100755 index 0000000..3d7b229 --- /dev/null +++ b/scripts/build_images.sh @@ -0,0 +1,4 @@ +#!/bin/bash +podman build -f build/Containerfile.centos -t local/ansible-dev-centos:latest . +podman build -f build/Containerfile.centos -t local/ansible-dev-debian:latest . +podman build -f build/Containerfile.fedora -t local/ansible-dev-fedora:latest . From abb491f0ec53837a2f07a45ba818514b238e30e0 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 13 Aug 2025 15:08:19 -0400 Subject: [PATCH 7/9] Fix clone command --- .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 935e350..71832c8 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -48,7 +48,7 @@ jobs: steps: - name: Clone Repository run: | - git clone ${{ vars.GITHUB_SERVER_URL }}/${{ vars.GITHUB_REPOSITORY }} + git clone "${{ vars.GITHUB_SERVER_URL }}/${{ vars.GITHUB_REPOSITORY }}" cd ansible-dev git checkout ${{ env.GITHUB_REF_NAME }} From adcba09a199773b01ca3624c70a42fad9544808f Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 13 Aug 2025 15:09:00 -0400 Subject: [PATCH 8/9] Fix clone command... for reals, y0 --- .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 71832c8..f90cbdd 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -48,7 +48,7 @@ jobs: steps: - name: Clone Repository run: | - git clone "${{ vars.GITHUB_SERVER_URL }}/${{ vars.GITHUB_REPOSITORY }}" + git clone https://gitea.thezengarden.net/podman/ansible-dev.git cd ansible-dev git checkout ${{ env.GITHUB_REF_NAME }} From 64032554759876716f764b102d192acd68ea156f Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 13 Aug 2025 15:14:02 -0400 Subject: [PATCH 9/9] Re-add CentOS build --- .gitea/workflows/build-release.yml | 7 +++++++ .gitea/workflows/build-test.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 4b6c90c..d128409 100644 --- a/.gitea/workflows/build-release.yml +++ b/.gitea/workflows/build-release.yml @@ -30,6 +30,11 @@ jobs: working-directory: /home/builds/src/ansible-dev steps: + - name: CentOS + 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: Fedora run: | echo "docker build -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ." @@ -51,6 +56,7 @@ jobs: - name: Push Images to Registry run: | pwd + 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_FEDORA }}:${{ env.GITHUB_REF_NAME }} docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} @@ -62,6 +68,7 @@ jobs: - name: Cleanup Build Images run: | pwd + 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_FEDORA }}:${{ env.GITHUB_REF_NAME }} docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index f90cbdd..386ad04 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -64,6 +64,11 @@ jobs: working-directory: /home/builds/src/ansible-dev steps: + - name: CentOS + 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: 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 }} ." @@ -85,6 +90,7 @@ jobs: - name: Push Images to Registry run: | pwd + 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_FEDORA }}:${{ env.GITHUB_REF_NAME }} docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} @@ -96,6 +102,7 @@ jobs: - name: Cleanup Build Images run: | pwd + 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_FEDORA }}:${{ env.GITHUB_REF_NAME }} docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}