Skip to content

Commit

Permalink
Also set the basecontainer for kiwi container builds
Browse files Browse the repository at this point in the history
  • Loading branch information
mlschroe committed Oct 1, 2024
1 parent 3937dc6 commit efa6cac
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Build/Kiwi.pm
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ sub kiwiparse {
}

my $containerconfig;
my $basecontainer;
for my $pref (@{$preferences || []}) {
if ($obsprofiles && $pref->{'profiles'}) {
next unless grep {$usedprofiles{$_}} split(",", $pref->{'profiles'});
Expand Down Expand Up @@ -394,6 +395,7 @@ sub kiwiparse {
}
die("derived_from url not using obs:/ scheme: $derived\n") unless defined $name;
push @packages, "container:$name";
$basecontainer = "container:$name";
push @containerrepos, $prp if $prp;
}

Expand Down Expand Up @@ -554,6 +556,7 @@ sub kiwiparse {
push @containertags, @extratags if @extratags;
$ret->{'container_tags'} = [ unify(@containertags) ] if @containertags;
}
$ret->{'basecontainer'} = $basecontainer if $basecontainer;
if ($obsprofiles) {
if (@$obsprofiles) {
$ret->{'profiles'} = [ unify(@$obsprofiles) ];
Expand Down

0 comments on commit efa6cac

Please sign in to comment.