buildstream-plugins 2.7.0__tar.gz → 2.8.0.dev0__tar.gz

{buildstream_plugins-2.7.0 → buildstream_plugins-2.8.0.dev0}/.asf.yaml

@@ -1,4 +1,3 @@
-
 #
 # Avoid diluting the dev mailing list with meta stuff,
 # redirect it all to the commit list.
@@ -40,3 +39,16 @@ github:
   # Enable pages publishing
   ghp_branch: gh-pages
   ghp_path: /docs
+  rulesets:
+    - name: "Default Branch Protection"
+      type: branch
+      branches:
+        includes:
+          - "~DEFAULT_BRANCH"
+          - "release/*"
+          - "rel/*"
+        excludes: []
+      bypass_teams:
+        - root
+      restrict_deletion: true
+      restrict_force_push: true

{buildstream_plugins-2.7.0 → buildstream_plugins-2.8.0.dev0}/NEWS

@@ -1,3 +1,9 @@
+=========================
+buildstream-plugins 2.8.0
+=========================
+
+ o docker: support OCI images (#105)
+
 =========================
 buildstream-plugins 2.7.0
 =========================

{buildstream_plugins-2.7.0/src/buildstream_plugins.egg-info → buildstream_plugins-2.8.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildstream-plugins
-Version: 2.7.0
+Version: 2.8.0.dev0
 Summary: A collection of plugins for BuildStream.
 Home-page: https://buildstream.build
 Author: The Apache Software Foundation

{buildstream_plugins-2.7.0 → buildstream_plugins-2.8.0.dev0}/pyproject.toml

@@ -12,13 +12,8 @@
 #  limitations under the License.
 #
 [build-system]
-requires = [
-    # We need at least version 36.6.0 that introduced "build_meta"
-    "setuptools>=36.6.0",
-    # In order to build wheels, and as required by PEP 517
-    "wheel",
-    "Cython"
-]
+# We need at least version 36.6.0 that introduced "build_meta"
+requires = ["setuptools>=36.6.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]

{buildstream_plugins-2.7.0 → buildstream_plugins-2.8.0.dev0}/src/buildstream_plugins/__init__.py

@@ -15,4 +15,4 @@
 #
 # Remember to adjust this version number before tagging releases
 #
-__version__ = "2.7.0"
+__version__ = "2.8.0.dev0"

{buildstream_plugins-2.7.0 → buildstream_plugins-2.8.0.dev0}/src/buildstream_plugins/sources/docker.py

@@ -21,8 +21,8 @@
 #
 
 """
-docker - stage files from Docker images
-=======================================
+docker - stage files from Docker/OCI images
+===========================================
 
 **Usage:**
 
@@ -282,6 +282,8 @@ class DockerRegistryV2Client:
         accept_types = [
             "application/vnd.docker.distribution.manifest.v2+json",
             "application/vnd.docker.distribution.manifest.list.v2+json",
+            "application/vnd.oci.image.index.v1+json",
+            "application/vnd.oci.image.manifest.v1+json",
         ]
 
         manifest_url = urljoin(image_path, "manifests", urllib.parse.quote(reference))
@@ -319,7 +321,10 @@ class DockerRegistryV2Client:
                 manifest=response.text,
             )
 
-        if manifest["mediaType"] == "application/vnd.docker.distribution.manifest.list.v2+json":
+        if manifest["mediaType"] in (
+            "application/vnd.docker.distribution.manifest.list.v2+json",
+            "application/vnd.oci.image.index.v1+json",
+        ):
             # This is a "fat manifest", we need to narrow down to a specific
             # architecture.
             for sub in manifest["manifests"]:
@@ -335,7 +340,10 @@ class DockerRegistryV2Client:
                 "No images found for architecture {}, OS {}".format(architecture, os_),
                 manifest=response.text,
             )
-        if manifest["mediaType"] == "application/vnd.docker.distribution.manifest.v2+json":
+        if manifest["mediaType"] in (
+            "application/vnd.docker.distribution.manifest.v2+json",
+            "application/vnd.oci.image.manifest.v1+json",
+        ):
             return response.text, our_digest
         else:
             raise DockerManifestError(
@@ -576,7 +584,10 @@ class DockerSource(Source):
                     raise SourceError(e) from e
 
                 for layer in manifest["layers"]:
-                    if layer["mediaType"] != "application/vnd.docker.image.rootfs.diff.tar.gzip":
+                    if layer["mediaType"] not in (
+                        "application/vnd.docker.image.rootfs.diff.tar.gzip",
+                        "application/vnd.oci.image.layer.v1.tar+gzip",
+                    ):
                         raise SourceError("Unsupported layer type: {}".format(layer["mediaType"]))
 
                     layer_digest = layer["digest"]

{buildstream_plugins-2.7.0 → buildstream_plugins-2.8.0.dev0/src/buildstream_plugins.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildstream-plugins
-Version: 2.7.0
+Version: 2.8.0.dev0
 Summary: A collection of plugins for BuildStream.
 Home-page: https://buildstream.build
 Author: The Apache Software Foundation