Changeset 2092 in ProjectBuilder

Timestamp:

Jun 1, 2016, 6:29:33 PM (8 years ago)

Author:

Bruno Cornec

Message:

Adds function pv_ve_docker_repo

Reuse code from VE.pm in pb to check whether we use a Registry or just a
repository
Adds a new conf param dockerrepository and document it (mandatory if no
registry used)

Location:

devel

Files:

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

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

@@ -127 +127 @@
  Example: dockerregistry mondorescue = localhost:5900/mondorescue
 
+=item B<dockerrepository>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: name of the docker repository to interact with if any. It is mandatory if no dockerregistry is defined.
+ Conffile: project
+ Example: dockerrepository mondorescue = localhost:5000/mondorescue
+
 =item B<extpkgdir>
 

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

@@ -32 +32 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_ve_launch pb_ve_snap pb_ve_get_type pb_ve_docker_repo pb_ve_docker_get_image);
+our @EXPORT = qw(pb_ve_launch pb_ve_snap pb_ve_get_type pb_ve_docker_repo pb_ve_docker_get_image pv_ve_docker_repo);
 
 ($VERSION,$REVISION) = pb_version_init();
@@ -73 +73 @@
 my $pbimage = shift;
 
-my $dockerregistry = undef;
 my $docrepo = "";           # By default no repository for docker available
 
@@ -84 +83 @@
 
 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'}});
-        $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}}).":";
-    }
+    $docrepo = pv_ve_docker_repo();
 }
 
@@ -432 +426 @@
 }
 
+sub pv_ve_docker_repo {
+
+my $docrepo = "";
+# Check acces to registry
+my ($dockerregistry) = pb_conf_get_if("dockerregistry");
+if ((defined $dockerregistry) && (defined $dockerregistry->{$ENV{'PBPROJ'}})) {
+    pb_ve_docker_registry($dockerregistry->{$ENV{'PBPROJ'}});
+    $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}}).":";
+} else {
+    my ($dockerrepository) = pb_conf_get("dockerrepository");
+    $docrepo = $dockerrepository->{$ENV{'PBPROJ'}}.":";
+}
+pb_log(1,"Using Docker Repository $docrepo\n");
+return($docrepo);
+}
+
 
 =head1 WEB SITES

devel/pb/bin/pb

@@ -2427 +2427 @@
     my $tpdir;
     my $tp;
-    my $docrepo;
     my $context = "$ENV{'PBTMP'}";
     my %tag;
@@ -2450 +2449 @@
             # docker manages the storage so rely on it
             $shcmdroot = "";
-            my ($dockerregistry) = pb_conf_get("dockerregistry");
-            $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}});
+            my $docrepo = pv_ve_docker_repo();
             $cmd1 = pb_check_req("docker",0);
             #my ($dockeropt) =  pb_conf_get_if("dockeropt");
@@ -2463 +2461 @@
             if ((not defined $pbimage) || ($pbimage eq "")) {
                 # If no image name given, create a naming convention
-                $tag{1} = "$docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
+                $tag{1} = "$docrepo$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
                 $tag{2} = "$tag{1}-pb";
                 $tag{3} = "$tag{2}-$ENV{'PBPROJ'}";