Revert layering changes for now

Author: arrdem

py/private/py_image_layer.bzl

@@ -30,26 +30,18 @@ oci_image(
 ```
 """
 
-load("@aspect_bazel_lib//lib:tar.bzl", "mtree_mutate", "mtree_spec", "tar")
+load("@aspect_bazel_lib//lib:tar.bzl", "mtree_spec", "tar")
 load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
 
 default_layer_groups = {
+    # match *only* external pip like repositories that contain the string "site-packages"
+    "packages": "\\\\.runfiles/.*/site-packages",
     # match *only* external repositories that begins with the string "python"
     # e.g. this will match
     #   `/hello_world/hello_world_bin.runfiles/rules_python~0.21.0~python~python3_9_aarch64-unknown-linux-gnu/bin/python3`
     # but not match
     #   `/hello_world/hello_world_bin.runfiles/_main/python_app`
-    #
-    # Note that due to dict key insertion order sensitivity, we want this group
-    # to go first so that the entire interpreter including its bundled libraries
-    # goes into the same layer.
     "interpreter": "\\\\.runfiles/.*python.*-.*/",
-    # match *only* external pip like repositories that contain the string "site-packages"
-    #
-    # Note that this comes after the interpreter so that we won't bundle
-    # interpreter embedded libraries (setuptools, pip, site) into the same
-    # libraries layer.
-    "packages": "\\\\.runfiles/.*/site-packages",
 }
 
 def _split_mtree_into_layer_groups(name, root, groups, group_names, **kwargs):
@@ -98,17 +90,7 @@ awk < $< 'BEGIN {
         **kwargs
     )
 
-def py_image_layer(
-        name,
-        binary,
-        root = "/",
-        layer_groups = {},
-        compress = "gzip",
-        tar_args = [],
-        compute_unused_inputs = 1,
-        platform = None,
-        owner = None,
-        **kwargs):
+def py_image_layer(name, binary, root = "/", layer_groups = {}, compress = "gzip", tar_args = [], compute_unused_inputs = 1, platform = None, **kwargs):
     """Produce a separate tar output for each layer of a python app
 
     > Requires `awk` to be installed on the host machine/rbe runner.
@@ -137,7 +119,6 @@ def py_image_layer(
         compress: Compression algorithm to use. Default is gzip. See: https://github.com/bazel-contrib/bazel-lib/blob/main/docs/tar.md#tar_rule-compress
         compute_unused_inputs: Whether to compute unused inputs. Default is 1. See: https://github.com/bazel-contrib/bazel-lib/blob/main/docs/tar.md#tar_rule-compute_unused_inputs
         platform: The platform to use for the transition. Default is None. See: https://github.com/bazel-contrib/bazel-lib/blob/main/docs/transitions.md#platform_transition_binary-target_platform
-        owner: An owner uid for the uncompressed files. See mtree_mutate: https://github.com/bazel-contrib/bazel-lib/blob/main/docs/tar.md#mutating-the-tar-contents
         tar_args: Additional arguments to pass to the tar rule. Default is `[]`. See: https://github.com/bazel-contrib/bazel-lib/blob/main/docs/tar.md#tar_rule-args
         **kwargs: attribute that apply to all targets expanded by the macro
 
@@ -149,24 +130,11 @@ def py_image_layer(
 
     # Produce the manifest for a tar file of our py_binary, but don't tar it up yet, so we can split
     # into fine-grained layers for better pull, push and remote cache performance.
-    manifest_name = name + ".manifest"
-    if owner:
-        mtree_spec(
-            name = manifest_name + ".preprocessed",
-            srcs = [binary],
-            **kwargs
-        )
-        mtree_mutate(
-            name = manifest_name,
-            mtree = name + ".manifest.preprocessed",
-            owner = owner,
-        )
-    else:
-        mtree_spec(
-            name = manifest_name,
-            srcs = [binary],
-            **kwargs
-        )
+    mtree_spec(
+        name = name + ".manifest",
+        srcs = [binary],
+        **kwargs
+    )
 
     groups = dict(**layer_groups)
     groups = dict(groups, **default_layer_groups)