Merge branch 'release' into testing

Reviewed-on: #13

.drone.yml

@@ -1,284 +0,0 @@
----
-##########################
-# 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.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"
-
-
-
----
-##########################
-# 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.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"
-
-
----
-####################
-# 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 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"

.gitea/workflows/build-release.yml

@@ -0,0 +1,102 @@
+name: Docker Build Pipeline
+
+on:
+  push:
+    branches:
+      - 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
+
+    steps:
+      - name: Environment check
+        run: |
+          hostnamectl
+          env
+          whoami
+          pwd
+          tree
+
+
+  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 }}
+
+
+  Build-Images:
+    runs-on: self-hosted
+    defaults:
+      run:
+        working-directory: /home/builds/src/ansible-dev
+
+    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 }} .
+
+      - 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 }} .
+
+      - 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 }} .
+
+
+  Push-Images:
+    runs-on: self-hosted
+    steps:
+      - name: Docker login
+        run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}
+
+      - name: Push Registry Images
+        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
+    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
+    steps:
+      - name: Cleanup Docker login
+        run: rm -v /home/builds/.docker/config.json

.gitea/workflows/build-test.yml

@@ -0,0 +1,102 @@
+name: Docker Build Pipeline
+
+on:
+  push:
+    branches:
+      - gitea-actions
+
+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
+
+    steps:
+      - name: Environment check
+        run: |
+          hostnamectl
+          env
+          whoami
+          pwd
+          tree
+
+
+  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 }}
+
+
+  Build-Images:
+    runs-on: self-hosted
+    defaults:
+      run:
+        working-directory: /home/builds/src/ansible-dev
+
+    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 }} .
+
+      - 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 }} .
+
+      - 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 }} .
+
+
+  Push-Images:
+    runs-on: self-hosted
+    steps:
+      - name: Docker login
+        run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}
+
+      - 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 }}
+
+
+  Cleanup-Build-Images:
+    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 }}-${{ 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 }}
+
+
+  Cleanup-Docker-Login:
+    runs-on: self-hosted
+    steps:
+      - name: Cleanup Docker login
+        run: rm -v /home/builds/.docker/config.json

conf/dnf.conf

@@ -5,3 +5,4 @@ clean_requirements_on_remove=True
 best=True
 skip_if_unavailable=False
 max_parallel_downloads=20
+deltarpm=True