Merge pull request #16809 from mlschroe/master

[backend] Put registry information in the DoD containers
openSUSE · Sep 5, 2024 · 7ddd062 · 7ddd062
2 parents 49f9d12 + bee9ab4
commit 7ddd062
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/src/backend/BSRepServer/Containerinfo.pm b/src/backend/BSRepServer/Containerinfo.pm
@@ -36,9 +36,9 @@ BSRepServer::Containerinfo
 
 =cut
 
-=head2  containerinfo2nevra - convert a containerinfo file to name/epoch/version/release/arch
+=head2  containerinfo2nevra - convert containerinfo data to name/epoch/version/release/arch
 
- input: $containerinfo - containerinfo filename in $dir
+ input: $containerinfo - containerinfo data
 
  output: hash containting name/epoch/...
 

diff --git a/src/backend/BSRepServer/Registry.pm b/src/backend/BSRepServer/Registry.pm
@@ -206,6 +206,7 @@ sub construct_containerinfo {
   BSVerify::verify_nevraquery($lnk);
   $lnk->{'hdrmd5'} = $containerinfo->{'tar_md5sum'};
   $lnk->{'path'} = "$pkgname.tar";
+  $lnk->{'annotation'} = $data->{'annotation'} if $data->{'annotation'};
   BSUtil::store("$dir/.$pkgname.obsbinlnk", "$dir/$pkgname.obsbinlnk", $lnk);
 }
 

diff --git a/src/backend/BSRepServer/Remote.pm b/src/backend/BSRepServer/Remote.pm
@@ -31,7 +31,7 @@ sub import_annotation {
   my ($annotation) = @_;
   return $annotation unless ref($annotation);
   my %a;
-  for (qw{repo disturl buildtime}) {
+  for (qw{repo disturl buildtime registry_refname registry_digest registry_fatdigest}) {
     $a{$_} = $annotation->{$_} if exists $annotation->{$_};
   }
   return BSUtil::toxml(\%a, $BSXML::binannotation);

diff --git a/src/backend/BSXML.pm b/src/backend/BSXML.pm
@@ -2117,6 +2117,9 @@ our $binannotation = [
 	'buildhost',
 	'disturl',
 	'binaryid',
+	'registry_refname',	# in DoD containers
+	'registry_digest',	# in DoD containers
+	'registry_fatdigest',	# in DoD containers
 	'package',		# only in build job annotation
 	'epoch',		# only in build job annotation
 	'version',		# only in build job annotation

diff --git a/src/backend/bs_dodup b/src/backend/bs_dodup
@@ -555,8 +555,13 @@ sub dod_registry {
   for my $resource (@dodresources) {
     next unless $resource =~ /^container:(.*):([^\/:]+)$/s;
     my ($repo, $tag) = ($1, $2);
-    $repo = "library/$repo" if $url =~ /docker\.io$/ && $repo !~ /\//;
-    $repo = $2 if $repo =~ /^([^\/]+)\/(.+)$/s && $1 eq $urldomain;
+    my $refname = "$repo:$tag";
+    if ($repo !~ /\//) {
+      $repo = "library/$repo" if $url =~ /docker\.io$/;
+    } else {
+      $repo = $2 if $repo =~ /^([^\/]+)\/(.+)$/s && $1 eq $urldomain;
+      $refname = "$repo:$tag";
+    }
     my $oldentry;
     $oldentry = $oldcache->{$resource} if $olddodresources{$resource};
     my ($olddigest, $oldfatdigest);
@@ -605,6 +610,12 @@ sub dod_registry {
       'digest' => $digest,
     };
     $pkg->{'fatdigest'} = $fatdigest if $fatdigest;
+    my $annotation = {
+      'registry_refname' => ($urldomain =~ /docker\.io/ ? '' : "$urldomain/") . $refname,
+      'registry_digest' => $digest,
+    };
+    $annotation->{'registry_fatdigest'} = $fatdigest if $fatdigest;
+    $pkg->{'annotation'} = BSUtil::toxml($annotation, $BSXML::binannotation);
     $cache->{$resource} = $pkg;
   }
   $cache->{'/dodresources'} = \@newdodresources;