From: Bastian Dehn <hhaalo@arcor.de>
Date: Wed, 22 Apr 2026 14:47:47 +0000 (+0200)
Subject: change containerfile with template
X-Git-Tag: 1.3.20^2~13
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=0d1aa397fc5e6ff380613631f709888c65372d6f;p=feierabend.git

change containerfile with template
---

diff --git a/builder/Containerfile-forky b/builder/Containerfile-forky
deleted file mode 100644
index a0fea95..0000000
--- a/builder/Containerfile-forky
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM debian:forky
-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-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.template b/builder/Containerfile.template
new file mode 100644
index 0000000..d5fd40c
--- /dev/null
+++ b/builder/Containerfile.template
@@ -0,0 +1,10 @@
+FROM $distro
+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/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
 }