Changeset 2003 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VE.pm
- Timestamp:
- Sep 30, 2015, 5:48:23 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/VE.pm
r1967 r2003 74 74 75 75 my $dockerregistry = undef; 76 my $docrepo = undef; # By default no repository for docker available76 my $docrepo = ""; # By default no repository for docker available 77 77 78 78 pb_log(2,"Entering pb_ve_launch at step $pbforce for type $vetype\n"); … … 88 88 if ((defined $dockerregistry) && (defined $dockerregistry->{$ENV{'PBPROJ'}})) { 89 89 pb_ve_docker_registry($dockerregistry->{$ENV{'PBPROJ'}}); 90 } else { 91 die "When using docker you need to declare a dockerregistry parameter. Read the man page" 90 $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}}).":"; 92 91 } 93 92 } … … 288 287 # If docker, create the image and remove the now temp dir except if we had one already 289 288 if (($vetype eq "docker") && ($pbforce == 0)) { 290 $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}});291 289 my $cmd1 = pb_check_req("docker",0); 292 290 # 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 300 298 301 my $pbimage = "$docrepo :$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";299 my $pbimage = "$docrepo$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"; 302 300 pb_system("$sudocmd $cmd1 import - $pbimage < $root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz"); 303 301 pb_system("$cmd1 push $pbimage"); … … 321 319 print DOCKER "RUN $cmd2 $pkgs\n"; 322 320 close(DOCKER); 323 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'}");321 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'}"); 324 322 unlink($tmpd); 325 323 }
Note:
See TracChangeset
for help on using the changeset viewer.