Skip to content

Commit

Permalink
Docker: remove container domain stripping
Browse files Browse the repository at this point in the history
Stripping the domain is not helpful, as the container that is
provided to us does no longer match the FROM line in the
Dockerfile.

Remove the stripping again and add code to the Download on Demand
service instead.
  • Loading branch information
mlschroe committed Jan 27, 2022
1 parent d133d9e commit 0cc23e5
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Build/Docker.pm
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,7 @@ sub parse {
if ($container ne 'scratch') {
if ($Build::Kiwi::urlmapper && $container =~ /^([^\/]+\.[^\/]+)\/[a-zA-Z0-9]/) {
my $prp = $Build::Kiwi::urlmapper->("registry://$1/");
if ($prp) {
$container =~ s/^[^\/]+\///; # strip domain
push @containerrepos, $prp;
}
push @containerrepos, $prp if $prp;
}
$container .= ':latest' unless $container =~ /:[^:\/]+$/;
$container = "container:$container";
Expand Down

0 comments on commit 0cc23e5

Please sign in to comment.