change builder for stable and unstable

diff --git a/.gitignore b/.gitignore
index 1236b3e54c2d44a462e81136b03d3d68b20218a7..51cf2cf740e009e3e1a33c2059740c5d74dfe47d 100644 (file)
--- 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 (file)
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 (file)
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 ec04a344c1bb0b52a7ccb2b44d63a79f9e4c3295..f096f4e722d7a1e9a90fe66053cfaa11c586199d 100644 (file)
--- 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 2df82c124e05bf1d05eefb4f8ae03a028350dffb..7fd277bc2c9612af140dc00af2771220c4a93f81 100755 (executable)
--- 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 (executable)
new mode 100644 (file)