change container buildin run

diff --git a/builder/Containerfile-bookworm b/builder/Containerfile-bookworm
index 980e18bb1c9d0f613145d044dc718cd456e4cb06..b5ad605f1508eb2c204136527339e60086d3a342 100644 (file)
--- a/builder/Containerfile-bookworm
+++ b/builder/Containerfile-bookworm
@@ -13,12 +13,5 @@ libjson-c-dev \
 libcmocka-dev \
 lcov \
 && apt-get clean
-CMD mkdir -p build-bookworm-test \
-&& cd build-bookworm-test \
-&& cmake -DRUN_TESTS=on .. \
-&& make -j$(nproc) \
-&& cd .. \
-&& mkdir -p build-bookworm \
-&& cd build-bookworm \
-&& cmake -DEXTRA_VERSION="-bookworm" -DCMAKE_BUILD_TYPE=Release .. \
-&& make -j$(nproc) package
\ No newline at end of file
+COPY run /app/run
+ENTRYPOINT /app/run
\ No newline at end of file

diff --git a/builder/Containerfile-trixie b/builder/Containerfile-trixie
index 99d0e22172400c664d52f00c0e67103f867931f0..ec04a344c1bb0b52a7ccb2b44d63a79f9e4c3295 100644 (file)
--- a/builder/Containerfile-trixie
+++ b/builder/Containerfile-trixie
@@ -13,12 +13,5 @@ libjson-c-dev \
 libcmocka-dev \
 lcov \
 && apt-get clean
-CMD mkdir -p build-trixie-test \
-&& cd build-trixie-test \
-&& cmake -DRUN_TESTS=on .. \
-&& make -j$(nproc) \
-&& cd .. \
-&& mkdir -p build-trixie \
-&& cd build-trixie \
-&& cmake -DEXTRA_VERSION="-trixie" -DCMAKE_BUILD_TYPE=Release .. \
-&& make -j$(nproc) package
\ No newline at end of file
+COPY run /app/run
+ENTRYPOINT /app/run
\ No newline at end of file

diff --git a/builder/build-in-container b/builder/build-in-container
index de8e9b69ec31b62cba51e7d0c2aa2165c404107e..2df82c124e05bf1d05eefb4f8ae03a028350dffb 100755 (executable)
--- a/builder/build-in-container
+++ b/builder/build-in-container
@@ -3,10 +3,10 @@
 main()
 {
        podman build -f builder/Containerfile-bookworm -t sane-kds-s2000w-net-builder-bookworm
-       podman run -tiv ./:/app --rm sane-kds-s2000w-net-builder-bookworm
+       podman run -v ./:/source --rm sane-kds-s2000w-net-builder-bookworm || return $?
 
        podman build -f builder/Containerfile-trixie -t sane-kds-s2000w-net-builder-trixie
-       podman run -tiv ./:/app --rm sane-kds-s2000w-net-builder-trixie
+       podman run -v ./:/source --rm sane-kds-s2000w-net-builder-trixie || return $?
 }
 
 main

diff --git a/builder/run b/builder/run
new file mode 100755 (executable)
index 0000000..c1f4727
--- /dev/null
+++ b/builder/run
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+errlog()
+{
+       local lastexit=$?
+       local msg="$1"
+
+       echo "❌ ERROR: $msg"
+       echo "🛑 EXIT $lastexit"
+       return $lastexit
+}
+
+run_tests()
+{
+       mkdir -p /app-tests
+       cd /app-tests
+       cmake -DRUN_TESTS=ON /source
+       echo "ℹ️ INFO: run tests"
+       make -j$(nproc) || errlog "tests failed" || return $?
+}
+
+build_package()
+{
+       mkdir -p /app-build
+       cd /app-build
+       source /etc/os-release
+       cmake -DEXTRA_VERSION="-$VERSION_CODENAME" -DCMAKE_BUILD_TYPE=Release /source
+       echo "ℹ️ INFO: build package"
+       make -j$(nproc) package || errlog "could not build package" || return $?
+}
+
+copy_package()
+{
+       source /etc/os-release
+       mkdir -p /source/build-$VERSION_CODENAME
+       echo "ℹ️ INFO: copy package"
+       cp /app-build/*.deb /source/build-$VERSION_CODENAME
+}
+
+main()
+{
+       echo "⭐ START: run"
+
+       run_tests || return $?
+       build_package || return $?
+       copy_package || return $?
+
+       echo "✅ SUCCESS run"
+}
+
+main
\ No newline at end of file