Changeset 2014 in ProjectBuilder

Timestamp:

Nov 25, 2015, 2:01:28 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Continue to fix issues with rights between docker container and host (mode of build dir should be more open at least 751, no sudo should be used to copy files back to avoid them belonging to root, and the initial cleanup is now done correctly for the TDIR)

File:

• devel/pb/bin/pb (modified) (5 diffs)

devel/pb/bin/pb

@@ -1573 +1573 @@
 
     pb_mkdir_p("$ENV{'PBBUILDDIR'}") if (! -d "$ENV{'PBBUILDDIR'}");
+    # Need to be traversed by others if using containers
+    chmod 0751,"$ENV{'PBBUILDDIR'}";
     chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
     my $made = ""; # pkgs made during build
@@ -2488 +2490 @@
         }
         $shcmd = "setarch i386 $shcmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
-        $cpcmd = "sudo /bin/cp -r ";
         if (($cmt =~ /VE/) && ($vetype ne "docker")) {
             # We need to get the home dir of the target account to deliver in the right place
@@ -2498 +2499 @@
             }
             close(PASS);
+            $cpcmd = "sudo /bin/cp -r ";
         }
         if (($cmt =~ /VE/) && ($vetype eq "docker")) {
@@ -2512 +2514 @@
                 $homedir = "/";
             }
-
+            $cpcmd = "cp -r ";
         }
         $cptarget = "$tpdir/$homedir/$tdir";
@@ -2679 +2681 @@
         print DOCKER pb_get_content($pbscript1);
         print DOCKER "\n# Get content back from guest in a host dir\n";
+        # Host dir seen as TDIR in container
         $cp2target = "$ENV{'PBBUILDDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
         pb_mkdir_p("$cp2target");
         chmod 0777,"$cp2target";
         print DOCKER "TDIR=$homedir/$bdir-2/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}\n";
-        print DOCKER "for i in $homedir/$bdir/*; do";
+        print DOCKER "for i in $homedir/$bdir/*; do\n";
         print DOCKER "  # Cleanup first to avoid rights issues for root owned files e.g.\n";
-        print DOCKER "  rm -f \$TDIR/\$i\n";
+        print DOCKER "  j=\`basename \$i\`\n";
+        print DOCKER "  rm -f \$TDIR/\$j\n";
         print DOCKER "  cp -r \$i \$TDIR\n";
         print DOCKER "done\n";
         print DOCKER "find \$TDIR -type f -print0 | xargs -0 chmod 644\n";
         print DOCKER "find \$TDIR -type d -print0 | xargs -0 chmod 777 2> /dev/null\n";
+        #print DOCKER "ls -al \$TDIR\n";
         close(DOCKER);
         $shcmd .= " -v $ENV{'PBBUILDDIR'}:$homedir/$bdir-2 -v $ENV{'PBTMP'}/vebuild:$homedir/$tdir-2 -w $homedir/$tdir-2 $tag{$pbstep} $dkcmd";