Do not prefix the base container with "container:"

It should be a container tag, not a dependency.
openSUSE · Nov 8, 2024 · 0914519 · 0914519
1 parent e2227e9
commit 0914519
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Build/Docker.pm b/Build/Docker.pm
@@ -350,8 +350,8 @@ sub parse {
 	    push @containerrepos, $prp if $prp;
 	  }
           $container .= ':latest' unless $container =~ /:[^:\/]+$/;
-          $container = "container:$container";
           $basecontainer = $container;
+          $container = "container:$container";
           push @{$ret->{'deps'}}, $container unless grep {$_ eq $container} @{$ret->{'deps'}};
         }
 	$as_container{$args[2]} = [ $args[0], $basecontainer ] if @args > 2 && lc($args[1]) eq 'as';
@@ -400,8 +400,9 @@ sub parse {
   }
   if ($basecontainer) {
     # always put the base container last
-    @{$ret->{'deps'}} = grep {$_ ne $basecontainer} @{$ret->{'deps'}};
-    push @{$ret->{'deps'}}, $basecontainer;
+    my $container = "container:$basecontainer";
+    @{$ret->{'deps'}} = grep {$_ ne $container} @{$ret->{'deps'}};
+    push @{$ret->{'deps'}}, $container;
   }
   push @{$ret->{'deps'}}, '--dorecommends--', '--dosupplements--' if $plusrecommended;
   push @{$ret->{'deps'}}, '--unorderedimagerepos' if $unorderedrepos;

diff --git a/Build/Kiwi.pm b/Build/Kiwi.pm
@@ -405,7 +405,7 @@ sub kiwiparse {
 	}
 	die("derived_from url not using obs:/ scheme: $derived\n") unless defined $name;
 	push @packages, "container:$name";
-	$basecontainer = "container:$name";
+	$basecontainer = $name;
 	push @containerrepos, $prp if $prp;
       }