Changeset 1910 in ProjectBuilder

Timestamp:

Oct 12, 2014, 1:23:00 PM (10 years ago)

Author:

Bruno Cornec

Message:

• build2ve now works for docker containers !! Just on time for LinuxCon EMEA where I'll demonstrate it :-)
• Need more tests however of course, especially for VE/VM which may now be broken as a consequence. Next version will be 0.13.x dur to

incompatibilities brought

File:

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

devel/pb/bin/pb

@@ -2048 +2048 @@
             if (($cmt eq "Sources") || ($cmt =~ /(V[EM]|RM)(build|prep)/)) {
                 $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.tar.gz $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.pbconf.tar.gz";
+                my $cmd2 = "ln -sf $pbpkg-$pbver$pbextdir.tar.gz $pbpkg-latest.tar.gz";
+                #my $cmd2 = "ln $pbpkg-$pbver$pbextdir.tar.gz $pbpkg-latest.tar.gz 2> /dev/null ; if [ \$? -ne 0 ]; then ln -sf $pbpkg-$pbver$pbextdir.tar.gz $pbpkg-latest.tar.gz ; fi";
                 if ($cmd eq "") {
-                    $cmd = "ln -sf $pbpkg-$pbver$pbextdir.tar.gz $pbpkg-latest.tar.gz";
+                    $cmd = $cmd2;
                 } else {
-                    $cmd = "$cmd ; ln -sf $pbpkg-$pbver$pbextdir.tar.gz $pbpkg-latest.tar.gz";
+                    $cmd = "$cmd ; $cmd2";
                 }
             } elsif ($cmt eq "Web") {
@@ -2180 +2182 @@
 
         # Repository management
-        open(PBS,"> $ENV{'PBBUILDDIR'}/pbscript.$$") || die "Unable to create $ENV{'PBBUILDDIR'}/pbscript.$$";
+        $pbscript{$v} = "$ENV{'PBBUILDDIR'}/pbscript.$$";
+        open(PBS,"> $pbscript{$v}") || die "Unable to create $pbscript{$v}";
         if ($pbos->{'type'} eq "rpm") {
             my $pbsha = pb_distro_get_param($pbos,pb_conf_get("ossha"));
@@ -2622 +2625 @@
     # It's already ready for CPAN
     my $shcmdbase = $shcmd;
-    my $dkcmd = "";
+    my $dkcmd;
     if ($cmt ne "CPAN") {
         if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep < 3)) {
@@ -2634 +2637 @@
             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 ; ";
+            $dkcmd = "/usr/bin/bash $homedir/$tdir-2/".basename($pbscript1);
+            #$dkcmd .= "/usr/bin/bash $homedir/$tdir-2/".basename($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\"";
+            $shcmd .= " \"echo \'cd $tdir ; if [ -x $pbscript1 ]; then $pbscript1; fi ;  if [ $pbkeep == 0 ]; then rm -f $pbscript1; fi\' | bash\"";
         }
     }
@@ -2649 +2652 @@
     if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
         pb_mkdir_p("$ENV{'PBTMP'}/vebuild");
+        my $tsrc = "";
         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";
+            $tsrc .= " ".basename($f);
+        }
+        my $ts = "$ENV{'PBTMP'}/vebuild/".basename($pbscript1);
+        open(DOCKER," > $ts") || confess "Unable to create $ts";
+        print DOCKER "#!/usr/bin/bash\n";
+        print DOCKER "# Put content from host to guest, copying to have the correct uid/gid and rights to do so\n";
+        print DOCKER "# set -x\n";
+        print DOCKER "for i in $tsrc; do\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";
+        $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 "  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";
+        close(DOCKER);
+        $shcmd .= " -v $ENV{'PBBUILDDIR'}:$homedir/$bdir-2 -v $ENV{'PBTMP'}/vebuild:$homedir/$tdir-2 -w $homedir/$tdir-2 $tag{$pbstep} $dkcmd";
     }
     my $ret = pb_system("$shcmd","Executing pbscript on $cptarget if needed",$cmdverb);
@@ -2686 +2714 @@
                 $made="$made $pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$j"; # if (($pbos->{'type'} ne "rpm") || ($j !~ /.src.rpm$/));
             }
+        
             print KEEP "$made\n";
             close(KEEP);
-            pb_system("$shcmdbase \"rm -rf $tdir $bdir\"","$cmt cleanup");
+            if (($vetype eq "docker") && ($pbstep >= 3)) {
+                pb_rm_rf("$cp2target");
+            } else {
+                pb_system("$shcmdbase \"rm -rf $tdir $bdir\"","$cmt cleanup");
+            }
 
             # Sign packages locally
@@ -3154 +3187 @@
         print SCRIPT "# Preparation for pb\n";
         print SCRIPT "rm -f \$HOME/.pbrc\n";
-        print SCRIPT "mv .pbrc \$HOME\n";
+        print SCRIPT "cp .pbrc \$HOME\n";
         print SCRIPT "cd ..\n";
     }