run findbr inside container

builddir is container only

diff --git a/docker-builder.sh b/docker-builder.sh
index 593adcb83d3d3031ab863a424674b5f8331f6541..7aae591cddd0f9c44680297a737cf160e890dc39 100755 (executable)
--- 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 501f97ed58993dd5b0d0dbc57ee0c4f20071495c..aeea384dc7c3814b85404d55ab7e873ea13301d6 100755 (executable)
--- 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",