run teeboth inside container

docker exec does not log to stdout/stderr directly it seems

diff --git a/Dockerfile b/Dockerfile
index f0422b6e3e6e6acaa6d3d3716752ee0ea9db3eb5..db95495943a0cda8bd36b8e2dd030921a363af66 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,5 +21,7 @@ RUN set -x \
 # switch user
 USER builder
 
+WORKDIR /home/services/builder
+
 # Use sleep to run forever
 CMD ["sleep", "infinity"]

diff --git a/docker-builder.sh b/docker-builder.sh
index c20bfd06c7ee76e65c83ebd65dc53d098ef02678..593adcb83d3d3031ab863a424674b5f8331f6541 100755 (executable)
--- a/docker-builder.sh
+++ b/docker-builder.sh
@@ -13,13 +13,15 @@ docker kill $name && docker rm $name || :
 dir=$(pwd)
 topdir=$dir/rpm
 cache=$dir/cache
+home=/home/services/builder
 install -d $topdir/bin $cache/poldek
 
 # start the container
 docker run --name=$name -d \
-       -v $topdir:/home/services/builder/rpm \
+       -v $topdir:$home/rpm \
+       -v $dir:$home/cleanbuild \
        -v $cache/poldek:/var/cache/poldek \
-       --tmpfs /home/services/builder/rpm/BUILD:rw,noexec,nosuid,size=2G \
+       --tmpfs $home/rpm/BUILD:rw,noexec,nosuid,size=2G \
        $image
 
 if [ ! -d $topdir/packages ]; then
@@ -45,7 +47,7 @@ chmod +x $topdir/bin/cleanup-la
 docker exec $name sh -xc '~/rpm/bin/cleanup-la'
 
 while true; do
-       ./teeboth $buildlog docker exec $name builder -nn -bb -R $package && rc=$? || rc=$?
+       docker exec $name cleanbuild/teeboth cleanbuild/$buildlog builder -nn -bb -R $package && rc=$? || rc=$?
 
        findbr=$package.findbr.log