mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Use import of OCI structs (#22765)
Fixes #22758 Otherwise we would need to rewrite the structs in `oci.go`.
This commit is contained in:
		@@ -10,8 +10,9 @@ 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 (
 | 
			
		||||
@@ -65,8 +66,8 @@ type Metadata struct {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// ParseImageConfig parses the metadata of an image config
 | 
			
		||||
func ParseImageConfig(mediaType oci.MediaType, r io.Reader) (*Metadata, error) {
 | 
			
		||||
	if strings.EqualFold(string(mediaType), helm.ConfigMediaType) {
 | 
			
		||||
func ParseImageConfig(mt string, r io.Reader) (*Metadata, error) {
 | 
			
		||||
	if strings.EqualFold(mt, helm.ConfigMediaType) {
 | 
			
		||||
		return parseHelmConfig(r)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user