[projects/cleanbuild] run findbr inside container

[glen]

commit 73f04dab0d5412bcd6ba6f8e9cf193c6c9dcb4f2
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Dec 15 00:01:57 2016 +0200

    run findbr inside container
    
    builddir is container only

 docker-builder.sh | 3 +--
 findbr            | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/docker-builder.sh b/docker-builder.sh
index 593adcb..7aae591 100755
--- a/docker-builder.sh
+++ b/docker-builder.sh
@@ -51,8 +51,7 @@ while true; do
 
 	findbr=$package.findbr.log
 
-	export DOCKER_CONTAINER=$name
-	./findbr rpm/BUILD/$package $buildlog > $findbr
+	docker exec $name cleanbuild/findbr rpm/BUILD/* cleanbuild/$buildlog > $findbr
 
 	installed_something=false
 	while read pkg msg; do
diff --git a/findbr b/findbr
index 501f97e..aeea384 100755
--- a/findbr
+++ b/findbr
@@ -4,14 +4,14 @@ use strict;
 use warnings;
 use IPC::Open2;
 use Cwd;
-use constant DOCKER => $ENV{'DOCKER_CONTAINER'} || 0;
+use constant DOCKER => -e '/.dockerenv';
 
 my $pwd = getcwd();
 # how to run poldek
 my @ignore = qw(vserver-packages python-devel-src);
 my @poldek;
 if (DOCKER) {
-	push(@poldek, "docker", "exec", DOCKER, "poldek");
+	push(@poldek, "poldek");
 } else {
 	push(@poldek, qw[sudo poldek -n th-x86_64-ready],
 		"--cachedir=$pwd/poldekcache",
@@ -65,7 +65,7 @@ my %skip;
 # for m4 in *.m4; do R=$(rpm -qf $m4); R=${R%-*-*}; \
 #   awk -vr=$R '/^\s*(AC_DEFUN|AU_ALIAS)/ { gsub(/\].*/,""); gsub(/.*\[/,""); print r " " $0}' $m4; \
 # done | sort | awk '{print "\t\"" $2 "\" => \"" $1 "\","}'
-my %ac2br = do "findbr-ac2br";
+my %ac2br = do (DOCKER ? 'cleanbuild/findbr-ac2br' : 'findbr-ac2br');
 
 my %cmake2br = (
 	"findkde4:44" => "kde4-kdelibs",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/cleanbuild.git/commitdiff/69f15f5277fecf5a04514b2500ca7f07a99d8a7c