Merge pull request #14222 from adrianschroeter/fix-mediaType

[backend] fix mediaType layer information
openSUSE · Apr 25, 2023 · b036a9e · b036a9e
2 parents d6dd6c3 + 7db4567
commit b036a9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/backend/BSContar.pm b/src/backend/BSContar.pm
@@ -447,7 +447,7 @@ sub create_layer_data {
     undef $lcomp;
   }
   my $layer_data = {
-    'mediaType' => $layer_ent->{'mimetype'} || ($oci ? ($newcomp eq 'zstd' ? $BSContar::mt_oci_zstd : $BSContar::mt_oci_gzip) : $BSContar::mt_docker_gzip),
+    'mediaType' => $layer_ent->{'mimetype'} || ($oci ? ($newcomp eq 'zstd' ? $BSContar::mt_oci_layer_zstd : $BSContar::mt_oci_layer_gzip) : $BSContar::mt_docker_layer_gzip),
     'size' => $layer_ent->{'size'},
     'digest' => $layer_ent->{'blobid'} || BSContar::blobid_entry($layer_ent),
   };

diff --git a/src/backend/BSPublisher/Containerinfo.pm b/src/backend/BSPublisher/Containerinfo.pm
@@ -39,7 +39,7 @@ sub construct_container_tar {
       $file = $fd;
     }
     die("missing blobid $blobid\n") unless -e $file;
-    push @tar, {'name' => $blobid, 'file' => $file, 'mtime' => $mtime, 'offset' => 0, 'size' => (-s $_), 'blobid' => $blobid};
+    push @tar, {'name' => $blobid, 'file' => $file, 'mtime' => $mtime, 'offset' => 0, 'size' => (-s _), 'blobid' => $blobid};
   }
   push @tar, {'name' => 'manifest.json', 'data' => $manifest, 'mtime' => $mtime, 'size' => length($manifest)};
   return (\@tar, $mtime, $containerinfo->{'layer_compression'});