Changeset 2092 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VE.pm
- Timestamp:
- Jun 1, 2016, 6:29:33 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/VE.pm
r2032 r2092 32 32 33 33 our @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 );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); 35 35 36 36 ($VERSION,$REVISION) = pb_version_init(); … … 73 73 my $pbimage = shift; 74 74 75 my $dockerregistry = undef;76 75 my $docrepo = ""; # By default no repository for docker available 77 76 … … 84 83 85 84 if ($vetype eq "docker") { 86 # Check acces to registry 87 ($dockerregistry) = pb_conf_get("dockerregistry"); 88 if ((defined $dockerregistry) && (defined $dockerregistry->{$ENV{'PBPROJ'}})) { 89 pb_ve_docker_registry($dockerregistry->{$ENV{'PBPROJ'}}); 90 $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}}).":"; 91 } 85 $docrepo = pv_ve_docker_repo(); 92 86 } 93 87 … … 432 426 } 433 427 428 sub pv_ve_docker_repo { 429 430 my $docrepo = ""; 431 # Check acces to registry 432 my ($dockerregistry) = pb_conf_get_if("dockerregistry"); 433 if ((defined $dockerregistry) && (defined $dockerregistry->{$ENV{'PBPROJ'}})) { 434 pb_ve_docker_registry($dockerregistry->{$ENV{'PBPROJ'}}); 435 $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}}).":"; 436 } else { 437 my ($dockerrepository) = pb_conf_get("dockerrepository"); 438 $docrepo = $dockerrepository->{$ENV{'PBPROJ'}}.":"; 439 } 440 pb_log(1,"Using Docker Repository $docrepo\n"); 441 return($docrepo); 442 } 443 434 444 435 445 =head1 WEB SITES
Note:
See TracChangeset
for help on using the changeset viewer.