fix test

.bazelrc

@@ -23,7 +23,7 @@ common:linux --sandbox_tmpfs_path=/tmp
 
 
 # Allow external dependencies to be retried. debian snapshot is unreliable and needs retries.
-common --experimental_repository_downloader_retries=200
+common --experimental_repository_downloader_retries=10
 
 # Load any settings specific to the current user.
 # .bazelrc.user should appear in .gitignore so that settings are not shared with team members

MODULE.bazel

@@ -7,7 +7,7 @@ module(
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "aspect_bazel_lib", version = "2.5.3")
+bazel_dep(name = "aspect_bazel_lib", version = "2.6.0")
 bazel_dep(name = "container_structure_test", version = "1.16.0")
 bazel_dep(name = "rules_oci", version = "1.7.4")
 

apt/private/index.bzl

@@ -31,7 +31,13 @@ load("@rules_distroless//distroless:defs.bzl", "flatten")
 flatten(
     name = "data",
     tars = [{src}],
-    compression = "gzip"
+    compress = "gzip"
+)
+
+alias(
+    name = "control",
+    actual = "@{repo_name}//:control",
+    visibility = ["//visibility:public"],
 )
 
 filegroup(
@@ -41,12 +47,6 @@ filegroup(
         {deps}
     ] + [":data"]
 )
-
-alias(
-    name = "control",
-    actual = "@{repo_name}//:control",
-    visibility = ["//visibility:public"],
-)
 '''
 
 def _deb_package_index_impl(rctx):
@@ -85,7 +85,7 @@ def _deb_package_index_impl(rctx):
                 target_name = package["arch"],
                 src = '"@%s_%s//:data"' % (rctx.attr.name, name),
                 deps = ",\n        ".join([
-                    '"@%s_%s//:data"' % (rctx.attr.name, dep)
+                    '"//%s/%s"' % (dep["name"], package["arch"])
                     for dep in package["dependencies"]
                 ]),
                 urls = [package["url"]],

apt/private/lockfile.bzl

@@ -32,7 +32,11 @@ def _add_package_dependency(lock, package, dependency, arch):
     if k not in lock.fast_package_lookup:
         fail("Broken state: %s is not in the lockfile." % package["Package"])
     i = lock.fast_package_lookup[k]
-    lock.packages[i]["dependencies"].append(_package_key(dependency, arch))
+    lock.packages[i]["dependencies"].append(dict(
+        key = _package_key(dependency, arch),
+        name = dependency["Package"],
+        version = dependency["Version"],
+    ))
 
 def _has_package(lock, name, version, arch):
     key = "%s_%s_%s" % (util.sanitize(name), util.sanitize(version), arch)

distroless/dependencies.bzl

@@ -30,7 +30,7 @@ def distroless_dependencies():
 
     http_archive(
         name = "aspect_bazel_lib",
-        sha256 = "6c25c59581041ede31e117693047f972cc4700c89acf913658dc89d04c338f8d",
-        strip_prefix = "bazel-lib-2.5.3",
-        url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.5.3/bazel-lib-v2.5.3.tar.gz",
+        sha256 = "3e0a430ada9b8f0f845767a267cf584bc94b8ec642d6093f31dca3938b18f6a1",
+        strip_prefix = "bazel-lib-2.6.0",
+        url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.6.0/bazel-lib-v2.6.0.tar.gz",
     )

distroless/private/flatten.bzl

@@ -7,12 +7,12 @@ _DOC = """Flatten multiple archives into single archive."""
 def _flatten_impl(ctx):
     bsdtar = ctx.toolchains[tar_lib.TOOLCHAIN_TYPE]
 
-    ext = tar_lib.common.compression_to_extension[ctx.attr.compression] if ctx.attr.compression else ".tar"
+    ext = tar_lib.common.compression_to_extension[ctx.attr.compress] if ctx.attr.compress else ".tar"
     output = ctx.actions.declare_file(ctx.attr.name + ext)
 
     args = ctx.actions.args()
     args.add("--create")
-    tar_lib.common.add_compression_args(ctx.attr.compression, args)
+    tar_lib.common.add_compression_args(ctx.attr.compress, args)
     args.add("--file", output)
     args.add_all(ctx.files.tars, format_each = "@%s")
 
@@ -37,7 +37,7 @@ flatten = rule(
             allow_empty = False,
             doc = "List of tars to flatten",
         ),
-        "compression": attr.string(
+        "compress": attr.string(
             doc = "Compress the archive file with a supported algorithm.",
             values = tar_lib.common.accepted_compression_types,
         ),

examples/apt/BUILD.bazel

@@ -40,7 +40,6 @@ group(
 
 tar(
     name = "sh",
-    srcs = [],
     mtree = [
         # needed as dpkg assumes sh is installed in a typical debian installation.
         "./bin/sh type=link link=/bin/bash",