From bcc19d69086a98b1727f6dd68c197662907afb49 Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Fri, 10 Oct 2025 16:07:54 +0200
Subject: [PATCH] change builder for stable and unstable

---
 .gitignore                                            |  7 ++-----
 .../{Containerfile-bookworm => Containerfile-forky}   |  3 ++-
 builder/Containerfile-trixie                          |  1 +
 builder/build-in-container                            | 11 +++++++----
 builder/run                                           |  0
 5 files changed, 12 insertions(+), 10 deletions(-)
 rename builder/{Containerfile-bookworm => Containerfile-forky} (88%)
 mode change 100755 => 100644 builder/run

diff --git a/.gitignore b/.gitignore
index 1236b3e..51cf2cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-build
-build-bookworm-test
-build-bookworm
-build-trixie-test
-build-trixie
+build*
+!builder
 .vscode
diff --git a/builder/Containerfile-bookworm b/builder/Containerfile-forky
similarity index 88%
rename from builder/Containerfile-bookworm
rename to builder/Containerfile-forky
index b5ad605..ba48d46 100644
--- a/builder/Containerfile-bookworm
+++ b/builder/Containerfile-forky
@@ -1,4 +1,4 @@
-FROM debian:bookworm
+FROM debian:forky
 WORKDIR /app
 RUN apt-get update && apt-get install -y build-essential cmake && apt-get clean
 RUN apt-get install -y \
@@ -14,4 +14,5 @@ libcmocka-dev \
 lcov \
 && apt-get clean
 COPY run /app/run
+RUN chmod 755 /app/run
 ENTRYPOINT /app/run
\ No newline at end of file
diff --git a/builder/Containerfile-trixie b/builder/Containerfile-trixie
index ec04a34..f096f4e 100644
--- a/builder/Containerfile-trixie
+++ b/builder/Containerfile-trixie
@@ -14,4 +14,5 @@ libcmocka-dev \
 lcov \
 && apt-get clean
 COPY run /app/run
+RUN chmod 755 /app/run
 ENTRYPOINT /app/run
\ No newline at end of file
diff --git a/builder/build-in-container b/builder/build-in-container
index 2df82c1..7fd277b 100755
--- a/builder/build-in-container
+++ b/builder/build-in-container
@@ -2,11 +2,14 @@
 
 main()
 {
-	podman build -f builder/Containerfile-bookworm -t sane-kds-s2000w-net-builder-bookworm
-	podman run -v ./:/source --rm sane-kds-s2000w-net-builder-bookworm || return $?
+	stable="trixie"
+	unstable="forky"
 
-	podman build -f builder/Containerfile-trixie -t sane-kds-s2000w-net-builder-trixie
-	podman run -v ./:/source --rm sane-kds-s2000w-net-builder-trixie || return $?
+	podman build -f builder/Containerfile-$stable -t sane-kds-s2000w-net-builder-$stable
+	podman run -v ./:/source --rm sane-kds-s2000w-net-builder-$stable || return $?
+
+	podman build -f builder/Containerfile-$unstable -t sane-kds-s2000w-net-builder-$unstable
+	podman run -v ./:/source --rm sane-kds-s2000w-net-builder-$unstable || return $?
 }
 
 main
diff --git a/builder/run b/builder/run
old mode 100755
new mode 100644
-- 
2.47.3