From 0d1aa397fc5e6ff380613631f709888c65372d6f Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Wed, 22 Apr 2026 16:47:47 +0200
Subject: [PATCH] change containerfile with template

---
 builder/Containerfile-trixie                  | 10 ---------
 ...ainerfile-forky => Containerfile.template} |  2 +-
 builder/builder                               | 21 +++++++++++++++----
 3 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 builder/Containerfile-trixie
 rename builder/{Containerfile-forky => Containerfile.template} (93%)

diff --git a/builder/Containerfile-trixie b/builder/Containerfile-trixie
deleted file mode 100644
index 43c7b43..0000000
--- a/builder/Containerfile-trixie
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM debian:trixie
-RUN apt-get update \
-&& apt-get install -y build-essential cmake file \
-&& apt-get clean
-RUN apt-get update \
-&& apt-get install -y libxml2-dev libcmocka-dev cppcheck \
-&& 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-forky b/builder/Containerfile.template
similarity index 93%
rename from builder/Containerfile-forky
rename to builder/Containerfile.template
index a0fea95..d5fd40c 100644
--- a/builder/Containerfile-forky
+++ b/builder/Containerfile.template
@@ -1,4 +1,4 @@
-FROM debian:forky
+FROM $distro
 RUN apt-get update \
 && apt-get install -y build-essential cmake file \
 && apt-get clean
diff --git a/builder/builder b/builder/builder
index b757dda..89df2ab 100755
--- a/builder/builder
+++ b/builder/builder
@@ -2,11 +2,24 @@
 
 main()
 {
-	local codenames="trixie forky"
+	local distros="debian:trixie debian:forky"
+	mkdir -p build
+	cp builder/run build/run
 
-	for codename in $codenames; do
-		podman build -f builder/Containerfile-$codename -t feierabend-builder-$codename
-		podman run --rm -v ./:/src -e SOLL_HOUR=$SOLL_HOUR -e SOLL_MINUTES=$SOLL_MINUTES feierabend-builder-$codename
+	for distro in $distros; do
+		local codename=${distro##*:}
+		cat builder/Containerfile.template \
+			| sed "s/\$distro/$distro/" \
+			> build/Containerfile-$codename
+		podman build \
+			-f build/Containerfile-$codename \
+			-t feierabend-builder-$codename
+		podman run \
+			--rm \
+			-v ./:/src \
+			-e SOLL_HOUR=$SOLL_HOUR \
+			-e SOLL_MINUTES=$SOLL_MINUTES \
+			feierabend-builder-$codename
 	done
 }
 
-- 
2.47.3