change container builder with template

diff --git a/builder/Containerfile-forky b/builder/Containerfile-forky
deleted file mode 100644 (file)
index b8379f1..0000000
--- a/builder/Containerfile-forky
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM debian:forky
-WORKDIR /app
-RUN apt-get update \
-    && apt-get install -y build-essential cmake \
-    && apt-get clean
-RUN apt-get install -y \
-    libsane-dev \
-    libconfuse-dev \
-    libcurl4-gnutls-dev \
-    libjson-c-dev \
-    libnetpbm-dev \
-    libjpeg-dev \
-    libtiff-dev \
-    libcmocka-dev \
-    cppcheck \
-    lcov \
-    libmagickcore-dev \
-    && 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 (file)
index 8ad3cbe..0000000
--- a/builder/Containerfile-trixie
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM debian:trixie
-WORKDIR /app
-RUN apt-get update \
-    && apt-get install -y build-essential cmake \
-    && apt-get clean
-RUN apt-get install -y \
-    libsane-dev \
-    libconfuse-dev \
-    libcurl4-gnutls-dev \
-    libjson-c-dev \
-    libnetpbm-dev \
-    libjpeg-dev \
-    libtiff-dev \
-    libcmocka-dev \
-    cppcheck \
-    lcov \
-    libmagickcore-dev \
-    && 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 (file)
index 0000000..9026fac
--- /dev/null
+++ b/builder/Containerfile.template
@@ -0,0 +1,21 @@
+FROM $distro
+WORKDIR /app
+RUN apt-get update \
+    && apt-get install -y build-essential cmake \
+    && apt-get clean
+RUN apt-get install -y \
+    libsane-dev \
+    libconfuse-dev \
+    libcurl4-gnutls-dev \
+    libjson-c-dev \
+    libnetpbm-dev \
+    libjpeg-dev \
+    libtiff-dev \
+    libcmocka-dev \
+    cppcheck \
+    lcov \
+    libmagickcore-dev \
+    && 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 7fd277bc2c9612af140dc00af2771220c4a93f81..2d9cd887cec72d2cb297e08cfb8ec9ce2472992e 100755 (executable)
--- a/builder/build-in-container
+++ b/builder/build-in-container
@@ -2,14 +2,19 @@
 
 main()
 {
-       stable="trixie"
-       unstable="forky"
+       local scriptpath=$(echo $0 | xargs dirname | xargs realpath)
+       local distros="debian:trixie debian:forky"
+       mkdir -p build
+       cp builder/run build/
 
-       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 $?
+       local codename=
+       local distro=
+       for distro in $distros; do
+               codename=${distro##*:}
+               cat $scriptpath/Containerfile.template | sed "s/\$distro/$distro/" > build/Containerfile-$codename
+               podman build -f build/Containerfile-$codename -t sane-kds-s2000w-net-builder-$codename
+               podman run -v ./:/source --rm sane-kds-s2000w-net-builder-$codename || return $?
+       done
 }
 
 main