Merge pull request #49 from anchore/fix-oci-docker-media-type

Fix OCI and Docker media types
anchore · Jun 26, 2023 · 36615b6 · 36615b6
2 parents c887a0b + c7dd9cb
commit 36615b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/adapter/adapter.go b/pkg/adapter/adapter.go
@@ -7,8 +7,8 @@ import (
 const (
 	HarborVulnReportv1MimeType    = "application/vnd.scanner.adapter.vuln.report.harbor+json; version=1.0"
 	RawVulnReportMimeType         = "application/vnd.scanner.adapter.vuln.report.raw+json"
-	DockerImageMimeType           = "application/vnd.oci.image.manifest.v2+json"
-	OciImageMimeType              = "application/vnd.docker.distribution.manifest.v2+json"
+	DockerImageMimeType           = "application/vnd.docker.distribution.manifest.v2+json"
+	OciImageMimeType              = "application/vnd.oci.image.manifest.v1+json"
 	HarborMetadataVulnDbUpdateKey = "harbor.scanner-adapter/vulnerability-database-updated-at"
 	HarborMetadataScannerTypeKey  = "harbor.scanner-adapter/scanner-type"
 	AdapterType                   = "os-package-vulnerability"

diff --git a/pkg/http/api/v1/handler.go b/pkg/http/api/v1/handler.go
@@ -22,8 +22,8 @@ const (
 	JSONRequestMimeType           = "application/json"
 	HarborVulnReportv1MimeType    = "application/vnd.scanner.adapter.vuln.report.harbor+json; version=1.0"
 	RawVulnReportMimeType         = "application/vnd.scanner.adapter.vuln.report.raw+json"
-	DockerImageMimeType           = "application/vnd.oci.image.manifest.v2+json"
-	OciImageMimeType              = "application/vnd.docker.distribution.manifest.v2+json"
+	DockerImageMimeType           = "application/vnd.docker.distribution.manifest.v2+json"
+	OciImageMimeType              = "application/vnd.oci.image.manifest.v1+json"
 	HarborMetadataVulnDbUpdateKey = "harbor.scanner-adapter/vulnerability-database-updated-at"
 	HarborMetadataScannerTypeKey  = "harbor.scanner-adapter/scanner-type"
 	AdapterType                   = "os-package-vulnerability"