Changeset 2003 in ProjectBuilder

Timestamp:

Sep 30, 2015, 5:48:23 PM (10 years ago)

Author:

Bruno Cornec

Message:

Presence of a local docker registry is now optional

Do not for ce user to have a local docker registry but just store
locally docker images if none is given as parameter.

Location:

devel

Files:

• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/VE.pm (modified) (5 diffs)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/etc/pb.conf.pod

@@ -121 +121 @@
 =item B<dockerregistry>
 
- Nature: Mandatory
- Key: project (as defined in the -p option or PBPROJ environment variable)
- Value: name of the docker registry to interact with
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: name of the docker registry to interact with if any
  Conffile: project
  Example: dockerregistry mondorescue = localhost:5900/mondorescue

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

@@ -74 +74 @@
 
 my $dockerregistry = undef;
-my $docrepo = undef;            # By default no repository for docker available
+my $docrepo = "";           # By default no repository for docker available
 
 pb_log(2,"Entering pb_ve_launch at step $pbforce for type $vetype\n");
@@ -88 +88 @@
     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"
+        $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}}).":";
     }
 }
@@ -288 +287 @@
     # If docker, create the image and remove the now temp dir except if we had one already
     if (($vetype eq "docker") && ($pbforce == 0)) {
-        $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}});
         my $cmd1 = pb_check_req("docker",0);
         # step 0 : nothing at creation -> tag n-v-a (made below)
@@ -299 +297 @@
             # TODO: check before that the image doesn't already exist in the docker registry
             
-            my $pbimage = "$docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
+            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");
@@ -321 +319 @@
             print DOCKER "RUN $cmd2 $pkgs\n";
             close(DOCKER);
-            pb_system("cd $ENV{'PBTMP'} ; $sudocmd $cmd1 build -t $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} .","Installing dependencies $pkgs in Docker container $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
+            pb_system("cd $ENV{'PBTMP'} ; $sudocmd $cmd1 build -t $docrepo$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} .","Installing dependencies $pkgs in Docker container $docrepo$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
             unlink($tmpd);
         }

devel/pb/bin/pb

@@ -3262 +3262 @@
 
     if (($action eq "test") && (! -x "$ENV{'PBDESTDIR'}/pbtest")) {
-            confess "No test script ($ENV{'PBDESTDIR'}/pbtest) found when in test mode. Aborting ...";
+        confess "No test script ($ENV{'PBDESTDIR'}/pbtest) found when in test mode. Aborting ...";
     }
     print SCRIPT "pb -h\n";