Changeset 1966 in ProjectBuilder

Timestamp:

Jun 11, 2015, 11:12:51 AM (9 years ago)

Author:

Bruno Cornec

Message:

Add the possibility to use an existing docker image for newve with -i
option

File:

• devel/pb-modules/lib/ProjectBuilder/VE.pm (modified) (5 diffs)

devel/pb-modules/lib/ProjectBuilder/VE.pm

@@ -83 +83 @@
 my ($vepath) = pb_conf_get("vepath");
 
+if ($vetype eq "docker") {
+    # Check acces to registry
+    ($dockerregistry) = pb_conf_get("dockerregistry");
+    if ((defined $dockerregistry) && (defined $dockerregistry->{$ENV{'PBPROJ'}})) {
+        pb_ve_docker_registry($dockerregistry->{$ENV{'PBPROJ'}});
+    } else {
+        die "When using docker you need to declare a dockerregistry parameter. Read the man page"
+    }
+}
+
 if (($vetype eq "chroot") || ($vetype eq "schroot") || ($vetype eq "docker")) {
 
@@ -90 +100 @@
     # We can probably only get those params now we have the distro context
     my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
-    if ($vetype eq "docker") {
-        # Check acces to registry
-        ($dockerregistry) = pb_conf_get("dockerregistry");
-        if ((defined $dockerregistry) && (defined $dockerregistry->{$ENV{'PBPROJ'}})) {
-            pb_ve_docker_registry($dockerregistry->{$ENV{'PBPROJ'}});
-        } else {
-            die "When using docker you need to declare a dockerregistry parameter. Read the man page"
-        }
-    }
 
     # Architecture consistency
@@ -128 +129 @@
     if (((((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 0)) && ($vetype ne "docker"))
         # For docker we may have a reference image that we'll use
-        || (($vetype eq "docker") && ($pbforce == 0))) {
+        || (($vetype eq "docker") && ($pbforce == 0) && ((not defined $pbimage) || ($pbimage eq "")))) {
 
         my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
@@ -291 +292 @@
         # step 0 : nothing at creation -> tag n-v-a (made below)
 
-        # Snaphot the VE to serve as an input for docker
-        pb_ve_snap($pbos,$root);
-        # Create the docker image from the previous bootstrap
-        # Need sudo to be able to create all files correctly
-        # TODO: check before that the image doesn't already exist in the docker registry
-        my $pbimage = "$docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
-        pb_system("$sudocmd $cmd1 import - $pbimage < $root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz");
-        pb_system("$cmd1 push $pbimage");
+        if ((not defined $pbimage) || ($pbimage eq "")) {
+            # Snaphot the VE to serve as an input for docker
+            pb_ve_snap($pbos,$root);
+            # Create the docker image from the previous bootstrap
+            # Need sudo to be able to create all files correctly
+            # TODO: check before that the image doesn't already exist in the docker registry
+            
+            my $pbimage = "$docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
+            pb_system("$sudocmd $cmd1 import - $pbimage < $root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz");
+            pb_system("$cmd1 push $pbimage");
+        } else {
+            # If we pass a parameter to -i, this is the name of an existing upstream image for that distro-ver-arch
+            pb_system("$sudocmd $cmd1 tag $pbimage $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
+        }
     }
 
@@ -394 +401 @@
 return($found);
 }
+
 sub pb_ve_get_type {