commit 02524fcf6927d01cf3a99a3bec2a6e4080816a12
Author: Elan Ruusamäe <[email protected]>
Date: Wed Dec 14 23:32:48 2016 +0200
run teeboth inside container
docker exec does not log to stdout/stderr directly it seems
Dockerfile | 2 ++
docker-builder.sh | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index f0422b6..db95495 100644
--- 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 c20bfd0..593adcb 100755
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/cleanbuild.git/commitdiff/02524fcf6927d01cf3a99a3bec2a6e4080816a12
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
