Changeset 2104 in ProjectBuilder


Ignore:
Timestamp:
Jul 20, 2016, 6:04:18 PM (5 years ago)
Author:
Bruno Cornec
Message:

Fix name of docker reg/repo function and fix it by invoking the older one content

Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/VE.pm

    r2092 r2104  
    3232 
    3333our @ISA = qw(Exporter);
    34 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);
     34our @EXPORT = qw(pb_ve_launch pb_ve_snap pb_ve_get_type pb_ve_docker_repo pb_ve_docker_get_image);
    3535
    3636($VERSION,$REVISION) = pb_version_init();
     
    8383
    8484if ($vetype eq "docker") {
    85     $docrepo = pv_ve_docker_repo();
     85    $docrepo = pb_ve_docker_repo();
    8686}
    8787
     
    381381}
    382382
    383 # Returns the docker repository to interact with
    384 sub pb_ve_docker_repo {
    385 
    386 my $dockerreg = shift;
    387 my $docrepo = "";
    388 my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerreg);
    389 $docrepo .= $host;
    390 $docrepo .= ":$port" if ((defined $port) && ($port ne ""));
    391 $docrepo .= "$path";
    392 return($docrepo);
    393 }
    394 
    395383sub pb_ve_docker_get_image {
    396384
     
    426414}
    427415
    428 sub pv_ve_docker_repo {
     416# Returns the docker repository to interact with
     417sub pb_ve_docker_repo {
    429418
    430419my $docrepo = "";
     
    433422if ((defined $dockerregistry) && (defined $dockerregistry->{$ENV{'PBPROJ'}})) {
    434423    pb_ve_docker_registry($dockerregistry->{$ENV{'PBPROJ'}});
    435     $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}}).":";
     424    my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerregistry->{$ENV{'PBPROJ'}}).":";
     425    $docrepo .= $host;
     426    $docrepo .= ":$port" if ((defined $port) && ($port ne ""));
     427    $docrepo .= "$path";
    436428} else {
    437429    my ($dockerrepository) = pb_conf_get("dockerrepository");
  • devel/pb/bin/pb

    r2101 r2104  
    24652465            # docker manages the storage so rely on it
    24662466            $shcmdroot = "";
    2467             my $docrepo = pv_ve_docker_repo();
     2467            my $docrepo = pb_ve_docker_repo();
    24682468            $cmd1 = pb_check_req("docker",0);
    24692469            #my ($dockeropt) =  pb_conf_get_if("dockeropt");
Note: See TracChangeset for help on using the changeset viewer.