Changeset 2092 in ProjectBuilder for devel/pb

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)

File:

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

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'}";