From 8b6a2e0ebfb0ec292d316f5abd16bae3bd4108b5 Mon Sep 17 00:00:00 2001
From: BloxerHD018 <bloxerhd018@gmail.com>
Date: Tue, 4 Nov 2025 18:18:06 +0000
Subject: [PATCH] Change CI to use Podman

---
 .gitlab-ci.yml | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c010fb..9097935 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,5 @@
 default:
-  image: docker:28.5.1-dind
-  services:
-    - "docker:28.5.1-dind"
+  image: quay.io/podman/stable
 
 variables:
   DOCKER_TLS_CERTDIR: "/certs"
@@ -9,6 +7,7 @@ variables:
 stages:
   - test
   - build-and-push-image
+  - push-retagged-branch
   - push-retagged-latest
 
 test:
@@ -19,24 +18,32 @@ test:
     - git submodule update --init
     - cargo test
 
-
 build-and-push-image:
   stage: build-and-push-image
   script:
     - git submodule update --init
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
-    - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - podman build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" .
+    - podman push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+
+push-retagged-branch:
+  stage: push-retagged-branch
+  script:
+    - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - podman pull "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman push "$CI_REGISTRY_IMAGE:latest"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"
+      when: on_success
 
 push-retagged-latest:
   stage: push-retagged-latest
   script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker pull "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
-    - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:latest"
-    - docker push "$CI_REGISTRY_IMAGE:latest"
+    - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - podman pull "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:latest"
+    - podman push "$CI_REGISTRY_IMAGE:latest"
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: on_success
-
-