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