From 1a0876fd83a258c275251ae14b4fdd774d215200 Mon Sep 17 00:00:00 2001
From: Hackintosh Five <git@hack5.dev>
Date: Mon, 7 Aug 2023 11:42:41 +0100
Subject: [PATCH] change build to podman

---
 .gitlab-ci.yml | 36 ++++++++++++++++++++++++------------
 Dockerfile     |  2 +-
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9507ae..6c84ac6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,17 +3,29 @@ variables:
 
 build:
   stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:v1.11.0-debug
-    entrypoint: [""]
+  image: quay.io/buildah/stable
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: never
+    # tagged releases do not use cache but can generate it
+    - if: '"$CI_COMMIT_TAG" != ""'
+      variables:
+        CACHE_POLICY: push
+    - if: '"$CI_COMMIT_TAG" == ""'
+      variables:
+        CACHE_POLICY: pull-push
   cache:
-    key: cache
-    paths:
-      - .cache/
+    - key: cache-$CI_COMMIT_REF_SLUG
+      fallback_keys:
+        - cache-$CI_DEFAULT_BRANCH
+        - cache-default
+      paths:
+        - .cache/
+      policy: $CACHE_POLICY
+  before_script:
+    - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
-    - /kaniko/executor
-      --cache --cache-repo=oci:$(pwd)/.cache/cache --compressed-caching=false --use-new-run
-      --context "${CI_PROJECT_DIR}"
-      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
-      --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
-      --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}"
+    - mkdir -p .cache/build
+    - buildah build -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}" -v "$(pwd)/.cache/build":/app/build:z .
+    - buildah push "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
+    - buildah push "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}" "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}"
diff --git a/Dockerfile b/Dockerfile
index e920c75..c8037f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ COPY CMakeLists.txt /app/src/
 COPY NOTICE /app/src/
 COPY lwip /app/src/lwip/
 COPY src /app/src/src/
-RUN mkdir /app/build && cd /app/build && cmake /app/src && make && mv tcpproxy ..
+RUN mkdir -p /app/build && cd /app/build && cmake /app/src && make && mv tcpproxy ..
 
 FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y --no-install-recommends openconnect libevent-core-2.1-7 && rm -rf /var/cache/apt/archives /var/lib/apt/lists/*