Changeset 1909 in ProjectBuilder

Timestamp:

Oct 10, 2014, 2:02:57 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Some improvements for build2ve for docker. Remains to handle the correct launch of the script (pb of multiple commands for now) and of

the volumes due to different UIDs between host and guest. I may need 4
volumes for that

File:

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

devel/pb/bin/pb

@@ -2412 +2412 @@
     my $dkaccount = "";
     my $cmd1 = "";
+    my $homedir = "";
     if ($cmt =~ /^VE/) {
         $tp = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
@@ -2471 +2472 @@
             } else {
                 # As we are in run phase use docker run. cmd will be completed below
-                $shcmd = "$cmd1 run --cidfile=\"$ENV{'PBTMP'}/ctn.cid\" $tag{$pbstep}";
+                $shcmd = "$cmd1 run --cidfile=\"$ENV{'PBTMP'}/ctn.cid\" --name $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$cmt";
             }
             #$shcmd = "$cmd1 build $dockeropt->{$ENV{'PBPROJ'}} -t $tag{$pbstep+1} $context";
@@ -2477 +2478 @@
         $shcmd = "setarch i386 $shcmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
         $cpcmd = "sudo /bin/cp -r ";
-        my $homedir = "";
         if (($cmt =~ /VE/) && ($vetype ne "docker")) {
             # We need to get the home dir of the target account to deliver in the right place
@@ -2497 +2497 @@
                 close(CID);
                 pb_system("$cmd1 rm $cid","","quiet");
+                unlink("$ENV{'PBTMP'}/ctn.cid");
             } else {
                 $homedir = "/";
@@ -2546 +2547 @@
             print DOCKER "RUN mkdir -p $cptarget\n";
             print DOCKER "RUN cd $cptarget ; for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\n";
+        } elsif (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
+            # Nothing to do here
         } else {
-            pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash -e\"","Preparing $tdir on $cptarget");
+            pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done ; $cmd\' | bash -e\"","Preparing $tdir on $cptarget");
         }
     } else {
@@ -2591 +2594 @@
         }
         print DOCKER "RUN cd $cptarget ; $cmd\n" if ((defined $cmd) && ($cmd ne ""));
+    } elsif (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
+        # Nothing to do
     } else {
         pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $src $cptarget 2> /dev/null","$cmt delivery in $cptarget");
@@ -2617 +2622 @@
     # It's already ready for CPAN
     my $shcmdbase = $shcmd;
+    my $dkcmd = "";
     if ($cmt ne "CPAN") {
         if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep < 3)) {
@@ -2627 +2633 @@
             print DOCKER "RUN chown -R pb $cptarget\n" if ($pbstep == 1);
             close(DOCKER);
+        } elsif (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
+            $dkcmd .= "/usr/bin/ls -al $homedir/$tdir ; /usr/bin/bash $homedir/$tdir/".basename($pbscript1);
+            #$dkcmd .= "cd $cptarget ;  bash ./$pbscript1 ;  if [ '$pbkeep' == '0' ]; then rm -f $pbscript1; fi ; ";
         } else {
             $shcmd .= " \"echo \'cd $tdir ; if [ -x $pbscript1 ]; then ./$pbscript1; fi ;  if [ '$pbkeep' == '0' ]; then rm -f ./$pbscript1\'; fi | bash\"";
@@ -2638 +2647 @@
     }
     # this is where we lanch the execution
+    if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
+        pb_mkdir_p("$ENV{'PBTMP'}/vebuild");
+        foreach my $f (split(/ +/,$src)) {
+            copy("$f","$ENV{'PBTMP'}/vebuild");
+        }
+        $shcmd .= " -v $ENV{'PBBUILDDIR'}:$homedir/$bdir -v $ENV{'PBTMP'}/vebuild:$homedir/$tdir $tag{$pbstep} $dkcmd";
+    }
     my $ret = pb_system("$shcmd","Executing pbscript on $cptarget if needed",$cmdverb);
 
@@ -3877 +3893 @@
 die "Aborting, one or more of the children failed." if ((not $all_ok) && ($Global::pb_stop_on_error));
 
+$sbx = "" if (not defined $sbx);
 # Launch the VM/VE/RM
 pb_log(2,"DEBUG: before parallel launch, pbscript hash is:".Dumper(%pbscript)."\n");