Changeset 2463 in ProjectBuilder

Timestamp:

Jan 18, 2020, 6:27:50 PM (5 years ago)

Author:

Bruno Cornec

Message:

Fix *2docker, tested with Fedora 30

File:

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

devel/pb/bin/pb

@@ -2649 +2649 @@
             # pbimage is used for docker and is setup to the right name depending on the step:
             # TODO: This is not coded yet
-            my $pbimage = undef;
             # step 0 : nothing at creation -> tag n-v-a (made in VE.pm)
             # step 1 : n-v-a + setup -> tag n-v-a-pb
@@ -2661 +2660 @@
                 $tag{2} = "$tag{1}-pb";
                 $tag{3} = "$tag{2}-$ENV{'PBPROJ'}";
-                $tag{4} = "$tag{2}-install-$ENV{'PBPROJ'}";
-                $tag{5} = "$tag{2}-test-$ENV{'PBPROJ'}";
+                $tag{4} = "$tag{2}-install";
+                $tag{5} = "$tag{2}-test";
             } else {
                 # If we were given an image name, just use it
@@ -2674 +2673 @@
             # 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}";
+            } else {
+                    $origimage = "$tag{$pbstep}";
+            }
             cluck "No image $tag{$pbstep} available in Docker, please create one first\n" if (not defined $found);
             # Now we use that image to do what is needed
@@ -2680 +2687 @@
             my $tmpd = "$context/Dockerfile";
             open(DOCKER, "> $tmpd") || confess "Unable to create the docker file $tmpd";
-            print DOCKER "FROM $tag{$pbstep}\n";
+            print DOCKER "FROM $origimage\n";
             print DOCKER "MAINTAINER project-builder.org aka pb\n";
             if ($pbstep == 1) {
@@ -2690 +2697 @@
             }
             print DOCKER "USER $dkaccount\n";
-            if (($pbstep <= 2) || ($pbstep > 3)) {
+            my $rmatend = "";
+            # As we are in run phase use docker run. cmd will be completed below
+            $rmatend = "--rm" if ($pbdebug lt 1);
+            if ($pbstep <= 2) {
                 $shcmd = "$cmd1 build -t $tag{$pbstep+1} $context";
                 #$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 ";
             } else {
-                my $rmatend = "";
-                # As we are in run phase use docker run. cmd will be completed below
-                $rmatend = "--rm" if ($pbdebug lt 1);
+                # pbstep 3
                 $shcmd = "$cmd1 run $rmatend --cidfile=\"$cidfile\" --user $dkaccount --name $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$cmt";
             }
@@ -2805 +2818 @@
                 copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2$pbextdir.tar.gz","$tpdir/tmp");
             } else {
-                copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1$pbextdir.tar.gz","$context");
-                copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2$pbextdir.tar.gz","$context");
-                print DOCKER "COPY ProjectBuilder-$pbver1$pbextdir.tar.gz /tmp/\n";
-                print DOCKER "COPY project-builder-$pbver2$pbextdir.tar.gz /tmp/\n";
+                if ($pbstep <= 3) {
+                    copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1$pbextdir.tar.gz","$context");
+                    copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2$pbextdir.tar.gz","$context");
+                    print DOCKER "COPY ProjectBuilder-$pbver1$pbextdir.tar.gz /tmp/\n";
+                    print DOCKER "COPY project-builder-$pbver2$pbextdir.tar.gz /tmp/\n";
+                }
             }
         } else {
@@ -3158 +3173 @@
 my $pbforce=shift;          # Force stop of VM. Default not.
 my $snapme = shift;         # By default do not snap a VM/VE/RM
-my $usesnap = shift;            # By default study the usage of the snapshot feature of VM/VE/RM    
+my $usesnap = shift;        # By default study the usage of the snapshot feature of VM/VE/RM    
 my $pbimage=shift;          # Which image to use to start the VM/VE
 my $vexist = undef;
@@ -4386 +4401 @@
         # pb -p pb -m distro-ver-arch newve -i distro:ver
         ($pbforce == 1) ? $lmsg = "Forced" : $lmsg = "not found";
-        pb_log(0,"Docker container $lctn $lmsg, creating it\n");
+        pb_log(0,"Docker image $lctn $lmsg, creating it\n");
         pb_launchv(undef,"ve",$v,$action,0,$pbforce,undef,undef,$pbimage);
     }
+    # Remove ref to pbimage so the rest uses the previous one built
+    $pbimage = undef;
     $lctn = "$docrepo$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-pb";
     $found = pb_ve_docker_get_image($lctn);
     if (($pbforce == 1) || (not defined $found)) {
         ($pbforce == 1) ? $lmsg = "Forced" : $lmsg = "not found";
-        pb_log(0,"Docker container $lctn $lmsg, creating it\n");
+        pb_log(0,"Docker image $lctn $lmsg, creating it\n");
         # pb -p pb -m distro-ver-arch setupve
         if ($savproj eq "pb") {
@@ -4410 +4427 @@
     if (($pbforce == 1) || (not defined $found)) {
         ($pbforce == 1) ? $lmsg = "Forced" : $lmsg = "not found";
-        pb_log(0,"Docker container $lctn $lmsg, creating it\n");
+        pb_log(0,"Docker image $lctn $lmsg, creating it\n");
         # pb -p pb -m distro-ver-arch prepve
         if ($savproj eq "pb") {