From: Bastian Dehn <hhaalo@arcor.de>
Date: Fri, 10 Oct 2025 14:07:54 +0000 (+0200)
Subject: change builder for stable and unstable
X-Git-Tag: v1.1.10^2~18
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=bcc19d69086a98b1727f6dd68c197662907afb49;p=sane-kds-s2000w-net.git

change builder for stable and unstable
---

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-bookworm
deleted file mode 100644
index b5ad605..0000000
--- a/builder/Containerfile-bookworm
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM debian:bookworm
-WORKDIR /app
-RUN apt-get update && apt-get install -y build-essential cmake && apt-get clean
-RUN apt-get install -y \
-file \
-libjpeg-dev \
-libtiff-dev \
-libnetpbm-dev \
-libsane-dev \
-libconfuse-dev \
-libcurl4-gnutls-dev \
-libjson-c-dev \
-libcmocka-dev \
-lcov \
-&& apt-get clean
-COPY run /app/run
-ENTRYPOINT /app/run
\ No newline at end of file
diff --git a/builder/Containerfile-forky b/builder/Containerfile-forky
new file mode 100644
index 0000000..ba48d46
--- /dev/null
+++ b/builder/Containerfile-forky
@@ -0,0 +1,18 @@
+FROM debian:forky
+WORKDIR /app
+RUN apt-get update && apt-get install -y build-essential cmake && apt-get clean
+RUN apt-get install -y \
+file \
+libjpeg-dev \
+libtiff-dev \
+libnetpbm-dev \
+libsane-dev \
+libconfuse-dev \
+libcurl4-gnutls-dev \
+libjson-c-dev \
+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