optimize builder script

diff --git a/builder/builder b/builder/builder
index 6a28b8c6db2e8d04c400e64029e2e0b7262ce65d..a2785420cb8b28dba5e8d4c552b35650cdf7c3e1 100755 (executable)
--- a/builder/builder
+++ b/builder/builder
@@ -3,11 +3,12 @@
 create_containerfile()
 {
        local distro="$1"
-       local scriptpath=$(echo $0 | xargs dirname | xargs realpath)
+       local distro_postfix="$2"
 
-       cat $scriptpath/Containerfile.template \
+       cat builder/Containerfile.template \
                | sed "s/\$distro/$distro/" \
-               > build/Containerfile-$distro_postfix
+               > build/Containerfile-$distro_postfix \
+               || return $?
 }
 
 build_container_image()
@@ -15,8 +16,9 @@ build_container_image()
        local distro_postfix="$1"
 
        podman build \
+               -t sane-kds-s2000w-net-builder-$distro_postfix \
                -f build/Containerfile-$distro_postfix \
-               -t sane-kds-s2000w-net-builder-$distro_postfix
+               || return $?
 }
 
 run_builder_container()
@@ -26,8 +28,8 @@ run_builder_container()
        podman run \
                --rm \
                -v .:/src \
-               -e EXTRA_VERSION=$distro_postfix \
-               sane-kds-s2000w-net-builder-$distro_postfix
+               sane-kds-s2000w-net-builder-$distro_postfix \
+               || return $?
 }
 
 main()
@@ -38,7 +40,7 @@ main()
 
        for distro in $distros; do
                local distro_postfix=${distro/:/-}
-               create_containerfile "$distro" || return $?
+               create_containerfile "$distro" "$distro_postfix" || return $?
                build_container_image "$distro_postfix" || return $?
                run_builder_container "$distro_postfix" || return $?
        done