From e68c0cbf8fadf8b263056a4988e4a8064689d072 Mon Sep 17 00:00:00 2001
From: ver4a <ver4a@uncontrol.me>
Date: Mon, 28 Apr 2025 21:14:16 +0200
Subject: [PATCH 1/2] ci: Replace podman-login action

---
 .forgejo/workflows/build-image.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml
index 954c8f5..3cc9e51 100644
--- a/.forgejo/workflows/build-image.yaml
+++ b/.forgejo/workflows/build-image.yaml
@@ -9,11 +9,11 @@ jobs:
       - uses: actions/checkout@v4
       - run:  cd ${{ env.GITHUB_WORKSPACE }}
       - name: 'Log in to registry'
-        uses: 'actions/podman-login@v1'
-        with:
-          registry: ${{ vars.REGISTRY_DOMAIN }}
-          username: ${{ vars.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
+        run: >
+          buildah login
+          -u ${{ vars.REGISTRY_USERNAME }}
+          -p ${{ secrets.REGISTRY_PASSWORD }}
+          ${{ vars.REGISTRY_DOMAIN }}
       # base
       - run:  mkdir cache
 

From e02afff268e2b9a6daa034c53cf6db0e7e94bcf1 Mon Sep 17 00:00:00 2001
From: ver4a <ver4a@uncontrol.me>
Date: Mon, 28 Apr 2025 21:38:10 +0200
Subject: [PATCH 2/2] ci: Fix buildah inspect format

---
 .forgejo/workflows/build-image.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml
index 3cc9e51..df737ff 100644
--- a/.forgejo/workflows/build-image.yaml
+++ b/.forgejo/workflows/build-image.yaml
@@ -51,7 +51,7 @@ jobs:
           --compression-format=zstd
           --compression-level=${{ vars.COMPRESSION_LEVEL }}
           ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main.expiring
-          ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main)
+          ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .OCIv1.Config.Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main)
 
       # base + ver4a's configuration
       - run:  podman build . -f Dockerfile.kde-ver4a --userns container --security-opt no-new-privileges --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:Z --squash --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }} --build-arg NAMESPACE=${{ vars.NAMESPACE }} -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-ver4a --annotation quay.expires-after=