Changeset 2162 in ProjectBuilder

Timestamp:

Jan 4, 2017, 12:38:26 AM (7 years ago)

Author:

Bruno Cornec

Message:

Start coding a sbx2docker action WIP

File:

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

devel/pb/bin/pb

@@ -271 +271 @@
 
 sbx2build + build2ve
+
+=item B<sbx2docker>
+
+sbx2build + build2ve with a potential build of all necessary docker containers to perform it
 
 =item B<sbx2rm>
@@ -928 +932 @@
 } elsif ($action =~ /^newver$/) {
     pb_newver();
+} elsif ($action =~ /^sbx2docker$/) {
+    my $savproj = $ENV{'PBPROJ'};
+    my $pkg;
+    my @pkg;
+    if ($#ARGV == -1) {
+        $pkg = pb_cms_get_pkg($defpkgdir,$extpkgdir);
+        @pkgs = @$pkg;
+    } else {
+        @pkgs = @ARGV;
+    }
+    #pb_log(1,"Packages to print:".Dumper(@pkgs)."\n");
+    
+    # Get the list of all VE we need to work on
+    my ($vm,$all);
+    if (not defined $ENV{'PBV'}) {
+        ($vm,$all) = pb_get2v("ve");
+    } else {
+        @$vm = split(/,/,$ENV{'PBV'});
+    }
+    
+    # TODO: parallelize
+    foreach my $v (@$vm) {
+        my $done = 0;
+        my $pbos = pb_distro_get_context($v);
+        # Docker images are (for now !) regular and use distro:ver
+        $pbimage = "$pbos->{'name'}".":$pbos->{'version'}";
+        # the first steps needs to be done with the pb project
+        $ENV{'PBPROJ'} = $appname;
+        my $found = pb_ve_docker_get_image("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
+        if (($pbforce == 1) || (not defined $found)) {
+            # pb -p pb -m distro-ver-arch newve -i distro:ver
+            pb_log(0,"Docker container $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} not found, creating it\n");
+            pb_parallel_launchv(undef,"ve",undef,0,$pbimage);
+        }
+        $found = pb_ve_docker_get_image("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-pb");
+        if (($pbforce == 1) || (not defined $found)) {
+            pb_log(0,"Docker container $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-pb not found, creating it\n");
+            # pb -p pb -m distro-ver-arch setupve
+            if ($savproj eq "pb") {
+                pb_cms2build("SandBox");
+                $done = 1;
+                pb_setup2v("ve","SandBox");
+            } else {
+                pb_setup2v("ve");
+            }
+        }
+        # Now back to our original project
+        $ENV{'PBPROJ'} = $savproj;
+        $found = pb_ve_docker_get_image("$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-pb-$ENV{'PBPROJ'}");
+        if (($pbforce == 1) || (not defined $found)) {
+            pb_log(0,"Docker container $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-pb-$ENV{'PBPROJ'} not found, creating it\n");
+            # pb -p pb -m distro-ver-arch prepve
+            if ($savproj eq "pb") {
+                pb_cms2build("SandBox");
+                $done = 1;
+            }
+            pb_build2v("ve","prep");
+        }
+        pb_log(0,"Instantiating a Docker container from $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-pb-$ENV{'PBPROJ'}\n");
+        if (($savproj ne "pb") || ($done == 0)) {
+            pb_cms2build("SandBox");
+        }
+        pb_build2v("ve","build");
+    }
 } elsif ($action =~ /^newve$/) {
     pb_parallel_launchv(undef,"ve",undef,0,$pbimage);
@@ -2499 +2567 @@
             }
             # If we do not create the image, then use the one we should have
+            # TODO: we don't do anything with found !!
             my $found = pb_ve_docker_get_image($tag{$pbstep});
+            confess "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
             # use a dockerfile to ease the creation of next images