Refactor: Add is_bool helper

[projects/cleanbuild.git] / bin / cleanbuild-docker.sh

diff --git a/bin/cleanbuild-docker.sh b/bin/cleanbuild-docker.sh
index 5288f307dbfefac14face4d153b0c29ce061cb2f..cd6641f947c58d9246e2cef8794bff0fb6fbd886 100755 (executable)
--- a/bin/cleanbuild-docker.sh
+++ b/bin/cleanbuild-docker.sh
@@ -46,6 +46,10 @@ is_no() {
        esac
 }
 
+is_bool() {
+       [ "$1" = "true" -o "$1" = "false" ] || die "Invalid boolean value: $1"
+}
+
 tmpfs() {
        if is_no "${TMPFS:-true}" || [ "$TMPFS" = "0" ]; then
                return
@@ -72,7 +76,7 @@ create_container() {
        install -d $topdir/logs
 
        # start the container
-       if !  have_container "$PACKAGE_NAME"; then
+       if ! have_container "$PACKAGE_NAME"; then
                TMPFS_SIZE=$TMPFS \
                PACKAGE_NAME=$PACKAGE_NAME \
                docker-compose run --rm -d \
@@ -82,11 +86,21 @@ create_container() {
                        cleanbuild
        fi
 
-       notice "Setup the homedir"
+       UID=$(id -u)
+       GID=$(id -g)
+       notice "Setup builder user ($UID:$GID)"
+
        docker exec --user=root -w / $name usermod -d $home builder
 
+       if [ "$UID" -gt 0 ]; then
+               docker exec --user=root -w / $name usermod -u $UID builder
+       fi
+       if [ "$GID" -gt 0 ]; then
+               docker exec --user=root -w / $name groupmod -g $GID builder
+       fi
+
        notice "Setup permissions"
-       docker exec --user=root -w / $name sh -c "cd $home && chown builder:builder . rpm rpm/logs rpm/BUILD rpm/RPMS .ccache"
+       docker exec --user=root -w / $name sh -c "cd $home && chown builder:builder . rpm rpm/logs rpm/BUILD rpm/RPMS rpm/packages .ccache"
 
        if [ ! -d $topdir/rpm-build-tools ]; then
                notice "Initialize rpm-build-tools"
@@ -199,7 +213,7 @@ parse_options() {
                        ;;
                --keep-container)
                        shift
-                       [ "$1" = "true" -o "$1" = "false" ] || die "Invalid boolean value: $1"
+                       is_bool "$1"
                        KEEP_CONTAINER=$1
                        ;;
                --with)
@@ -230,11 +244,11 @@ main() {
 
        $TRACING && set -x
        local name="cleanbuild-$PACKAGE_NAME"
-       create_container
        if $EXEC; then
                enter_container
                return
        fi
+       create_container
        package_prepare
        package_build
 }