mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-10-30 05:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Use import of OCI structs (#22765) (#22805)"

Browse source 
This reverts commit a239d6c4a9.

Refs: https://codeberg.org/forgejo/forgejo/issues/334
This commit is contained in:
Loïc Dachary 2023-02-11 17:57:13 +01:00
commit 1184fa36a3
No known key found for this signature in database
GPG key ID: 992D23B392F9E4F2
12 changed files with 326 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/packages/container/metadata.go
View file

@ -11,9 +11,8 @@ import (
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/packages/container/helm"
"code.gitea.io/gitea/modules/packages/container/oci"
"code.gitea.io/gitea/modules/validation"
oci "github.com/opencontainers/image-spec/specs-go/v1"
)
const (
@ -67,8 +66,8 @@ type Metadata struct {
}
// ParseImageConfig parses the metadata of an image config
func ParseImageConfig(mt string, r io.Reader) (*Metadata, error) {
if strings.EqualFold(mt, helm.ConfigMediaType) {
func ParseImageConfig(mediaType oci.MediaType, r io.Reader) (*Metadata, error) {
if strings.EqualFold(string(mediaType), helm.ConfigMediaType) {
return parseHelmConfig(r)
}