Changeset 2004 in ProjectBuilder

Timestamp:

Sep 30, 2015, 5:48:25 PM (9 years ago)

Author:

Bruno Cornec

Message:

Solve remaining rights issues with docker

• Erase destination files in case one already existed with right preventing us to copy on it
• Use the dkaccount to run the container, instead of the user launching the docker command
• Use the variable dkaccount instead of a hardcoded pb reference

File:

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

devel/pb/bin/pb

@@ -2483 +2483 @@
             } else {
                 # As we are in run phase use docker run. cmd will be completed below
-                $shcmd = "$cmd1 run --cidfile=\"$ENV{'PBTMP'}/ctn.cid\" --name $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$cmt";
+                $shcmd = "$cmd1 run --cidfile=\"$ENV{'PBTMP'}/ctn.cid\" --user $dkaccount --name $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$cmt";
             }
             #$shcmd = "$cmd1 build $dockeropt->{$ENV{'PBPROJ'}} -t $tag{$pbstep+1} $context";
@@ -2643 +2643 @@
             print DOCKER "RUN cd $cptarget ; perl ./$s ; if [ '$pbkeep' = '0' ]; then rm -f $s; fi\n";
             print DOCKER "RUN rm -rf $cptarget/*\n";
-            print DOCKER "RUN chown -R pb $cptarget\n" if ($pbstep == 1);
+            print DOCKER "RUN chown -R $dkaccount $cptarget\n" if ($pbstep == 1);
             close(DOCKER);
         } elsif (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
@@ -2672 +2672 @@
         print DOCKER "# set -x\n";
         print DOCKER "for i in $tsrc; do\n";
+        print DOCKER "  # Cleanup first to avoid rights issues for root owned files e.g.\n";
+        print DOCKER "  rm -f $homedir/$tdir/\$i\n";
         print DOCKER "  cp $homedir/$tdir-2/\$i $homedir/$tdir\n";
         print DOCKER "done\n";
-        print DOCKER "cd $homedir/$tdir-2\n";
-        print DOCKER "ls -al\n";
-        my $sc = pb_get_content($pbscript1);
-        print DOCKER "$sc";
-        print DOCKER "# Get content back from guest in a host dir\n";
+        print DOCKER "(cd $homedir/$tdir-2 ; ls -al)\n";
+        print DOCKER pb_get_content($pbscript1);
+        print DOCKER "\n# Get content back from guest in a host dir\n";
         $cp2target = "$ENV{'PBBUILDDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
         pb_mkdir_p("$cp2target");
@@ -2684 +2684 @@
         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 "  # Cleanup first to avoid rights issues for root owned files e.g.\n";
+        print DOCKER "  rm -f \$TDIR/\$i\n";
         print DOCKER "  cp -r \$i \$TDIR\n";
         print DOCKER "done\n";
@@ -3209 +3211 @@
         print SCRIPT "rm -f \$HOME/.pbrc\n";
         print SCRIPT "cp .pbrc \$HOME\n";
+        # TODO: Why ?
         print SCRIPT "cd ..\n";
     }