Changeset 2464 in ProjectBuilder

Timestamp:

Jan 18, 2020, 7:37:02 PM (4 years ago)

Author:

Bruno Cornec

Message:

Works up to install2pkg which needs to be fixed itself

File:

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

devel/pb/bin/pb

@@ -2626 +2626 @@
     my $cidfile;
     my $homedir = "";
+    my $origimage = undef;
+    my $cmdverb = "verbose";
+    if (($cmt eq "Announce") || ($cmt eq "CPAN")) {
+        $cmdverb = undef;
+    } elsif (defined ($v)) {
+        $cmdverb = "verbose_\[$v\] ";
+    }
     if ($cmt =~ /^VE/) {
         $tp = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
@@ -2673 +2680 @@
             # TODO: we don't do anything with found !!
             my $found = pb_ve_docker_get_image($tag{$pbstep});
-            my $origimage = undef;
-            if (($pbstep > 3) && (not defined $found)) {
-                    # initiate these images from the last n-v-a-pb-pbproj below
-                    $found = 0;
-                    $origimage = "$tag{3}";
+            if ($pbstep > 3) {
+                # initiate these images from the last n-v-a-pb-pbproj below, removing existing ones
+                if (defined $found) {
+                    pb_system("$cmd1 rmi $tag{$pbstep}","Removing Docker image $tag{$pbstep} first",$cmdverb);
+                }
+                $origimage = "$tag{3}";
+                $found = 0;
             } else {
-                    $origimage = "$tag{$pbstep}";
+                $origimage = "$tag{$pbstep}";
             }
             cluck "No image $tag{$pbstep} available in Docker, please create one first\n" if (not defined $found);
@@ -2704 +2713 @@
                 #$shcmd = "$cmd1 build $dockeropt->{$ENV{'PBPROJ'}} -t $tag{$pbstep+1} $context";
             } elsif ($pbstep > 3) {
-                # We force the destruciton of the image before recreating it for install or test
-                $shcmd = "$cmd1 rmi $tag{$pbstep} ; ";
-                $shcmd .= "$cmd1 build -t $tag{$pbstep} $context ; ";
-                $shcmd .= "$cmd1 run $rmatend --cidfile=\"$cidfile\" --user $dkaccount --name $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$cmt ";
+                $shcmd = "$cmd1 build -t $tag{$pbstep} $context ; ";
+                $shcmd .= "$cmd1 run $rmatend --cidfile=\"$cidfile\" --user $dkaccount --name $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$ENV{'PBPROJ'}";
             } else {
                 # pbstep 3
@@ -2728 +2735 @@
             if ($pbstep >= 2) {
                 # We need to get the home dir of the target account to deliver in the right place
-                $homedir = `$cmd1 run --rm --cidfile="$cidfile" $tag{$pbstep} grep -E '^$dkaccount:' /etc/passwd | cut -d: -f6`;
+                $homedir = `$cmd1 run --rm --cidfile="$cidfile" $origimage grep -E '^$dkaccount:' /etc/passwd | cut -d: -f6`;
                 chomp($homedir);
                 open(CID,"$cidfile") || cluck "Unable to open $cidfile";
@@ -2886 +2893 @@
             $shcmd .= " \"echo \'cd $tdir ; if [ -x $s ]; then ./$s; fi ;  if [ $pbkeep == 0 ]; then rm -f $s; fi\' | bash\"";
         }
-    }
-    my $cmdverb = "verbose";
-    if (($cmt eq "Announce") || ($cmt eq "CPAN")) {
-        $cmdverb = undef;
-    } elsif (defined ($v)) {
-        $cmdverb = "verbose_\[$v\] ";
     }
     # this is where we launch the execution