builder with env for soll time

diff --git a/builder/builder b/builder/builder
index e2bf58bf95daaabf1832bd5b00767eba265f58d6..b757dda8732b414b35790879122797c053bbac88 100755 (executable)
--- a/builder/builder
+++ b/builder/builder
@@ -2,11 +2,12 @@
 
 main()
 {
-       podman build -f builder/Containerfile-trixie -t feierabend-builder-trixie
-       podman run --rm -v ./:/src feierabend-builder-trixie
+       local codenames="trixie forky"
 
-       podman build -f builder/Containerfile-forky -t feierabend-builder-forky
-       podman run --rm -v ./:/src feierabend-builder-forky
+       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
+       done
 }
 
 main

diff --git a/builder/run b/builder/run
index 32bde5a68eaf3d543b377b411bbcfcb7b3833725..19cb511a44de5eabffad370ac27b1fa9ecd0a13d 100644 (file)
--- a/builder/run
+++ b/builder/run
@@ -9,8 +9,11 @@ run_tests()
 
 build()
 {
+       local soll_hour=${SOLL_HOUR:="8"}
+       local soll_minutes=${SOLL_MINUTES:="0"}
+
        mkdir -p /build && cd /build
-       cmake -DCMAKE_BUILD_TYPE=Release /src
+       cmake -DCMAKE_BUILD_TYPE=Release -DSOLL_HOUR="$soll_hour" -DSOLL_MINUTES="$soll_minutes" /src
        make -j$(nproc) package
 }