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 755b359136636bfbdc4c92b93588ae246e96fd95..cd6641f947c58d9246e2cef8794bff0fb6fbd886 100755 (executable)
--- a/bin/cleanbuild-docker.sh
+++ b/bin/cleanbuild-docker.sh
@@ -9,8 +9,9 @@ PROGRAM=${0##*/}
 : ${TRACING=false}
 : ${WITH=}
 : ${WITHOUT=}
-: ${KEEP_CONTAINER=false}
+: ${KEEP_CONTAINER=true}
 : ${TMPFS="4G"}
+: ${EXEC=false}
 
 dir=$(pwd)
 image=registry.gitlab.com/pld-linux/cleanbuild
@@ -45,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
@@ -53,33 +58,61 @@ tmpfs() {
        echo "--tmpfs $home/rpm/BUILD:rw,exec,nosuid,size=$TMPFS"
 }
 
+have_container() {
+    local name="$1" id
+
+    id=$(docker ps -a -f "label=cleanbuild=$name" --format '{{.ID}}')
+
+    test -n "$id"
+}
+
 create_container() {
-       notice "Clean up old container: $name"
-       docker kill $name >/dev/null 2>&1 || :
-       docker rm $name >/dev/null 2>&1 || :
+       if ! $KEEP_CONTAINER; then
+               notice "Clean up old container: $name"
+               docker kill $name >/dev/null 2>&1 || :
+               docker rm $name >/dev/null 2>&1 || :
+       fi
 
        install -d $topdir/logs
 
        # start the container
-       TMPFS_SIZE=$TMPFS \
-       PACKAGE_NAME=$PACKAGE_NAME \
-       docker-compose run --rm -d \
-               --name=$name \
-               --label=cleanbuild=$PACKAGE_NAME \
-               cleanbuild
-
-       notice "Setup the homedir"
+       if ! have_container "$PACKAGE_NAME"; then
+               TMPFS_SIZE=$TMPFS \
+               PACKAGE_NAME=$PACKAGE_NAME \
+               docker-compose run --rm -d \
+                       --name=$name \
+                       --workdir=$home/rpm/packages/$PACKAGE_NAME \
+                       --label=cleanbuild=$PACKAGE_NAME \
+                       cleanbuild
+       fi
+
+       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 .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"
-               docker exec $name builder --init-rpm-dir
+               docker exec -w / $name builder --init-rpm-dir
        fi
 }
 
+enter_container() {
+       notice "Entering container for $PACKAGE_NAME"
+       docker exec --user=root -it $name bash
+}
+
 package_prepare() {
        notice "Fetch sources and install dependencies"
        if [ -d $topdir/packages/$PACKAGE_NAME ]; then
@@ -89,15 +122,18 @@ package_prepare() {
        fi
 
        notice "Fetch package sources"
-       docker exec $name builder -g $PACKAGE_NAME
+       docker exec --user=root -w / $name setfacl -x u:builder /etc/resolv.conf
+       docker exec -w / $name builder -g $PACKAGE_NAME
 
        if ! $NETWORKING; then
                notice "Disable networking: Prevent network access for user builder like PLD Linux builders"
                docker exec --user=root -w / $name setfacl -m u:builder:--- /etc/resolv.conf
        fi
 
-       git_tag=$(GIT_DIR=$topdir/packages/$PACKAGE_NAME/.git git describe --tags --always)
+       notice "Find latest tag on the branch"
+       git_tag=$(docker exec -w / -e GIT_DIR=$home/rpm/packages/$PACKAGE_NAME/.git $name git describe --tags --always)
        buildlog=rpm/logs/${git_tag#auto/*/}.log
+       notice "Build log: $buildlog"
 }
 
 package_build() {
@@ -106,17 +142,22 @@ package_build() {
 
        while true; do
                notice "Install dependencies"
-               docker exec $name builder -g -R "$@"
+               docker exec -w / -t $name builder -g -R "$@"
                notice "Remove .la dependencies"
                docker exec --user=root -w / $name $home/cleanbuild/bin/cleanup-la
                notice "Reset findunusedbr state after deps install"
                docker exec --user=root -w / $name $home/cleanbuild/bin/findunusedbr -c / $home/rpm/packages/$PACKAGE_NAME/$PACKAGE_NAME.spec
 
                notice "Build package"
-               docker exec $name cleanbuild/bin/teeboth $buildlog builder -bb --define '__spec_clean_body %{nil}' "$@" && rc=$? || rc=$?
+               docker exec -w $home $name cleanbuild/bin/teeboth $buildlog builder -bb --define '__spec_clean_body %{nil}' "$@" && rc=$? || rc=$?
+               # Kill processes on Ctrl+C
+               if [ "$rc" = 255 ]; then
+                       docker exec -w / $name pkill -e -u builder
+                       die "Aborted" $rc
+               fi
 
                findbr=$PACKAGE_NAME.findbr.log
-               builddir=$(docker exec $name sh -c 'test ! -d rpm/BUILD/* || echo rpm/BUILD/*')
+               builddir=$(docker exec -w $home $name sh -c 'test ! -d rpm/BUILD/* || echo rpm/BUILD/*')
                if [ -z "$builddir" ]; then
                        die "No build dir. Build failed?" 6
                fi
@@ -148,7 +189,7 @@ package_build() {
 
 parse_options() {
        local t
-       t=$(getopt -o 'x' --long 'network,no-tmpfs,notmpfs,tmpfs:,keep-container,with:,without:' -n "$PROGRAM" -- "$@")
+       t=$(getopt -o 'x' --long 'network,exec,no-tmpfs,notmpfs,tmpfs:,keep-container:,with:,without:' -n "$PROGRAM" -- "$@")
        [ $? != 0 ] && exit $?
        eval set -- "$t"
 
@@ -160,6 +201,9 @@ parse_options() {
                --network)
                        NETWORKING=true
                        ;;
+               --exec)
+                       EXEC=true
+                       ;;
                --no-tmpfs|--notmpfs)
                        TMPFS=false
                        ;;
@@ -168,7 +212,9 @@ parse_options() {
                        TMPFS="$1"
                        ;;
                --keep-container)
-                       KEEP_CONTAINER=true
+                       shift
+                       is_bool "$1"
+                       KEEP_CONTAINER=$1
                        ;;
                --with)
                        shift
@@ -198,6 +244,10 @@ main() {
 
        $TRACING && set -x
        local name="cleanbuild-$PACKAGE_NAME"
+       if $EXEC; then
+               enter_container
+               return
+       fi
        create_container
        package_prepare
        package_build