pulp-container 2.22.8__tar.gz → 2.22.9__tar.gz

{pulp_container-2.22.8 → pulp_container-2.22.9}/CHANGES.md

@@ -8,6 +8,14 @@
 
 [//]: # (towncrier release notes start)
 
+## 2.22.9 (2026-07-21) {: #2.22.9 }
+
+#### Bugfixes {: #2.22.9-bugfix }
+
+- Added OCI manifest as an allowed media type in the Docker manifest list schema.
+
+---
+
 ## 2.22.8 (2026-04-24) {: #2.22.8 }
 
 No significant changes.

{pulp_container-2.22.8 → pulp_container-2.22.9}/MANIFEST.in

@@ -9,3 +9,4 @@ include functest_requirements.txt
 include test_requirements.txt
 include unittest_requirements.txt
 exclude releasing.md
+include pulp_container/tests/unit/fixtures/*

{pulp_container-2.22.8 → pulp_container-2.22.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-container
-Version: 2.22.8
+Version: 2.22.9
 Summary: Container plugin for the Pulp Project
 Home-page: https://pulpproject.org/
 Author: Pulp Team

{pulp_container-2.22.8 → pulp_container-2.22.9}/pulp_container/app/__init__.py

@@ -23,7 +23,7 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_container.app"
     label = "container"
-    version = "2.22.8"
+    version = "2.22.9"
     python_package_name = "pulp-container"
 
     @staticmethod

{pulp_container-2.22.8 → pulp_container-2.22.9}/pulp_container/app/json_schemas.py

@@ -124,6 +124,7 @@ DOCKER_MANIFEST_LIST_V2_SCHEMA = {
                         "enum": [
                             MEDIA_TYPE.MANIFEST_V2,
                             MEDIA_TYPE.MANIFEST_V1,
+                            MEDIA_TYPE.MANIFEST_OCI,
                         ],
                     },
                     "size": {"type": "number"},

pulp_container-2.22.9/pulp_container/tests/unit/fixtures/ryuk_0.13.0_manifest_list.json

@@ -0,0 +1,154 @@
+{
+   "schemaVersion": 2,
+   "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
+   "manifests": [
+      {
+         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+         "size": 1157,
+         "digest": "sha256:dbf39a38239100ad20536e75f0066163bdf989c8b6a07116c8814f991878756f",
+         "platform": {
+            "architecture": "amd64",
+            "os": "windows",
+            "os.version": "10.0.17763.7678"
+         }
+      },
+      {
+         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+         "size": 1157,
+         "digest": "sha256:92ae77da69814eadc33ece22a9a1f564b508fd3bc0ab6c27f53ffb3b4e2f7ff0",
+         "platform": {
+            "architecture": "amd64",
+            "os": "windows",
+            "os.version": "10.0.20348.4052"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:1c4aaca7ec29ab100a805a90718619dba7a542f7fadc6198c8f47b1c6fc058c5",
+         "platform": {
+            "architecture": "ppc64le",
+            "os": "linux"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:1f965b7a234671c706b444540c86033bbe667b3d6df3453b88a16bb897328bea",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:286b5e78baf03adff94af82199af6b936c701957d94dd001cae375af41519fd3",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:2a5038e0424aee30b8e1ecaf3889eb18b1496baca035b5cbdfeb79faa06e867a",
+         "platform": {
+            "architecture": "arm64",
+            "os": "linux"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:2ff824f3c5b87343601f88b944039949004c4b25d5c95b95b8d513d9592abfd9",
+         "platform": {
+            "architecture": "arm",
+            "os": "linux",
+            "variant": "v7"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:31c852ef4caf457d598a67ef9a19626a99e0080186903e15f9cacac70eaeb08f",
+         "platform": {
+            "architecture": "arm",
+            "os": "linux",
+            "variant": "v6"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:46d7dcf2110fc9e7eb1e8bc589d7507fb4db20b36a7ae401d0f7daa5457986cd",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:5af5b45d5d54da802b42c1754577d9b3b91b61bb20ca301b1de08e47b5027fb1",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:6312fce3d003e5b1973f64ff61d7465c0d8a3f6216123264fd8688caace685ce",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:725de179c309cd78dc85aa0e315f7a2c6230efe166d8a972113ecf47feb122d7",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:9f74979cb9d95b5dd3f695e567cd5cd1806a006895d80fa9002a9e68f607f495",
+         "platform": {
+            "architecture": "amd64",
+            "os": "linux"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:d5fcc1e6aaa51949c7d11e8ac9cf407efb9d52dd9f871542cfaf750c9b1ccc2b",
+         "platform": {
+            "architecture": "386",
+            "os": "linux"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:f5aa3faf94fb7c630ecb8bc6d4ba506cfdbd90ff8c882710b07fb953b4cf09ae",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:fa81566cb9a09b2cd72a703e17160c6cf6906a22d4eeae716ce7f0f42053efdb",
+         "platform": {
+            "architecture": "s390x",
+            "os": "linux"
+         }
+      }
+   ]
+}

{pulp_container-2.22.8 → pulp_container-2.22.9}/pulp_container/tests/unit/test_json_schemas.py

@@ -1,4 +1,5 @@
 import json
+from pathlib import Path
 
 from jsonschema import Draft7Validator
 
@@ -198,3 +199,31 @@ class TestOCISchema(TestCase):
             validate_manifest(manifest, MEDIA_TYPE.MANIFEST_OCI, "")
         except ManifestInvalid:
             self.fail()
+
+
+class TestDockerManifestListSchema(TestCase):
+    """A test case for validating Docker manifest list JSON schema."""
+
+    def test_ryuk_manifest_list_with_oci_entries(self):
+        """
+        Validate a real Docker manifest list that references OCI image manifests.
+
+        testcontainers/ryuk:0.13.0 on Docker Hub publishes a Docker manifest list
+        containing both Docker v2 and OCI image manifest entries.
+        """
+        fixture_path = Path(__file__).parent / "fixtures" / "ryuk_0.13.0_manifest_list.json"
+        manifest = json.loads(fixture_path.read_text())
+        entry_media_types = {entry["mediaType"] for entry in manifest["manifests"]}
+
+        self.assertEqual(manifest["mediaType"], MEDIA_TYPE.MANIFEST_LIST)
+        self.assertIn(MEDIA_TYPE.MANIFEST_V2, entry_media_types)
+        self.assertIn(MEDIA_TYPE.MANIFEST_OCI, entry_media_types)
+
+        try:
+            validate_manifest(
+                manifest,
+                MEDIA_TYPE.MANIFEST_LIST,
+                "sha256:31b31269d06603366cbfd0284708dcd2e281e8a4188e53fce3d3304439d0df3d",
+            )
+        except ManifestInvalid:
+            self.fail()

{pulp_container-2.22.8 → pulp_container-2.22.9}/pulp_container.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-container
-Version: 2.22.8
+Version: 2.22.9
 Summary: Container plugin for the Pulp Project
 Home-page: https://pulpproject.org/
 Author: Pulp Team

{pulp_container-2.22.8 → pulp_container-2.22.9}/pulp_container.egg-info/SOURCES.txt

@@ -136,4 +136,5 @@ pulp_container/tests/functional/api/test_token_authentication.py
 pulp_container/tests/unit/__init__.py
 pulp_container/tests/unit/test_json_schemas.py
 pulp_container/tests/unit/test_models.py
-pulp_container/tests/unit/test_serializers.py
+pulp_container/tests/unit/test_serializers.py
+pulp_container/tests/unit/fixtures/ryuk_0.13.0_manifest_list.json

{pulp_container-2.22.8 → pulp_container-2.22.9}/pyproject.toml

@@ -57,7 +57,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "2.22.8"
+current_version = "2.22.9"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"

{pulp_container-2.22.8 → pulp_container-2.22.9}/setup.py

@@ -10,7 +10,7 @@ with open("README.rst") as f:
 
 setup(
     name="pulp-container",
-    version="2.22.8",
+    version="2.22.9",
     description="Container plugin for the Pulp Project",
     long_description=long_description,
     license="GPLv2+",