treewide: bump rules_oci to v2.0.0
Change-Id: Idbeb3a3b7645c5b6f774eb43d218ca0bc79dccc1
Reviewed-on: https://review.monogon.dev/c/monogon/+/3474
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/MODULE.bazel b/MODULE.bazel
index ca7bde1..cb6a517 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -68,7 +68,7 @@
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_pkg", version = "1.0.1")
-bazel_dep(name = "rules_oci", version = "1.8.0")
+bazel_dep(name = "rules_oci", version = "2.0.0")
bazel_dep(name = "aspect_bazel_lib", version = "2.7.8")
bazel_dep(name = "rules_multirun", version = "0.9.0")
bazel_dep(name = "rules_python", version = "0.34.0")
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index cea9c64..6650ffa 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -14,11 +14,10 @@
"https://bcr.bazel.build/modules/apple_support/1.15.1/MODULE.bazel": "a0556fefca0b1bb2de8567b8827518f94db6a6e7e7d632b4c48dc5f865bc7c85",
"https://bcr.bazel.build/modules/apple_support/1.15.1/source.json": "517f2b77430084c541bc9be2db63fdcbb7102938c5f64c17ee60ffda2e5cf07b",
"https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef",
- "https://bcr.bazel.build/modules/aspect_bazel_lib/1.28.0/MODULE.bazel": "d793416e81c34d137d75ef84fe622df6c550826772a7f06e3b98a0d1c347fe1c",
"https://bcr.bazel.build/modules/aspect_bazel_lib/1.31.2/MODULE.bazel": "7bee702b4862612f29333590f4b658a5832d433d6f8e4395f090e8f4e85d442f",
"https://bcr.bazel.build/modules/aspect_bazel_lib/1.38.0/MODULE.bazel": "6307fec451ba9962c1c969eb516ebfe1e46528f7fa92e1c9ac8646bef4cdaa3f",
"https://bcr.bazel.build/modules/aspect_bazel_lib/1.40.3/MODULE.bazel": "668e6bcb4d957fc0e284316dba546b705c8d43c857f87119619ee83c4555b859",
- "https://bcr.bazel.build/modules/aspect_bazel_lib/1.42.1/MODULE.bazel": "b7aca918a7c7f4cb9ea223e7e2cba294760659ec7364cc551df156067e4a3621",
+ "https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.2/MODULE.bazel": "780d1a6522b28f5edb7ea09630748720721dfe27690d65a2d33aa7509de77e07",
"https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.8/MODULE.bazel": "1631a1bbb119fc372f9aaa55df6c7d0a59fdb1640324b3d5c0047d976eb57aae",
"https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.8/source.json": "896a2b322e70b0d1517b8758159e71fa3c2bf7bce5ecda3eb99c9e84fdd71e5e",
"https://bcr.bazel.build/modules/aspect_rules_js/1.33.1/MODULE.bazel": "db3e7f16e471cf6827059d03af7c21859e7a0d2bc65429a3a11f005d46fc501b",
@@ -28,6 +27,7 @@
"https://bcr.bazel.build/modules/aspect_rules_lint/0.12.0/source.json": "9a3668e1ee219170e22c0e7f3ab959724c6198fdd12cd503fa10b1c6923a2559",
"https://bcr.bazel.build/modules/bazel_features/0.1.0/MODULE.bazel": "47011d645b0f949f42ee67f2e8775188a9cf4a0a1528aa2fa4952f2fd00906fd",
"https://bcr.bazel.build/modules/bazel_features/1.1.1/MODULE.bazel": "27b8c79ef57efe08efccbd9dd6ef70d61b4798320b8d3c134fd571f78963dbcd",
+ "https://bcr.bazel.build/modules/bazel_features/1.10.0/MODULE.bazel": "f75e8807570484a99be90abcd52b5e1f390362c258bcb73106f4544957a48101",
"https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8",
"https://bcr.bazel.build/modules/bazel_features/1.11.0/source.json": "c9320aa53cd1c441d24bd6b716da087ad7e4ff0d9742a9884587596edfe53015",
"https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9",
@@ -52,8 +52,6 @@
"https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
"https://bcr.bazel.build/modules/c-ares/1.15.0/MODULE.bazel": "ba0a78360fdc83f02f437a9e7df0532ad1fbaa59b722f6e715c11effebaa0166",
"https://bcr.bazel.build/modules/c-ares/1.15.0/source.json": "5e3ed991616c5ec4cc09b0893b29a19232de4a1830eb78c567121bfea87453f7",
- "https://bcr.bazel.build/modules/container_structure_test/1.16.0/MODULE.bazel": "5bf2659d7724e232c10435e7ef3d5b3d3bc4bfc7825060e408b4a5e7d165ddf7",
- "https://bcr.bazel.build/modules/container_structure_test/1.16.0/source.json": "c28ee996e071609f1c28fffce4297b0f2cb7f73387a6db56509310910641b188",
"https://bcr.bazel.build/modules/curl/8.4.0/MODULE.bazel": "0bc250aa1cb69590049383df7a9537c809591fcf876c620f5f097c58fdc9bc10",
"https://bcr.bazel.build/modules/curl/8.4.0/source.json": "8b9532397af6a24be4ec118d8637b1f4e3e5a0d4be672c94b2275d675c7f7d6b",
"https://bcr.bazel.build/modules/gazelle/0.37.0/MODULE.bazel": "d1327ba0907d0275ed5103bfbbb13518f6c04955b402213319d0d6c0ce9839d4",
@@ -145,8 +143,8 @@
"https://bcr.bazel.build/modules/rules_multirun/0.9.0/source.json": "e882ba77962fa6c5fe68619e5c7d0374ec9a219fb8d03c42eadaf6d0243771bd",
"https://bcr.bazel.build/modules/rules_nodejs/5.8.2/MODULE.bazel": "6bc03c8f37f69401b888023bf511cb6ee4781433b0cb56236b2e55a21e3a026a",
"https://bcr.bazel.build/modules/rules_nodejs/5.8.2/source.json": "6e82cf5753d835ea18308200bc79b9c2e782efe2e2a4edc004a9162ca93382ca",
- "https://bcr.bazel.build/modules/rules_oci/1.8.0/MODULE.bazel": "a4d656f6a0e7c7c1a73b9e394e37c8f9bbc237143ce9e19deba7a532fe189552",
- "https://bcr.bazel.build/modules/rules_oci/1.8.0/source.json": "c14770a5dfba2980d8f1ebeaac0bfa4848ffb7febfca84ac2a7fd7e8f4d9e1e3",
+ "https://bcr.bazel.build/modules/rules_oci/2.0.0/MODULE.bazel": "5d5cf1932238b009f874d5a9f214bbedf5d8cec8e5028e083f1147726876572f",
+ "https://bcr.bazel.build/modules/rules_oci/2.0.0/source.json": "ea89dd54d1f473a6fb1a6c2d0660b741ee832d5141ac0b9c90d5c8fc9b5e3bb3",
"https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc",
"https://bcr.bazel.build/modules/rules_pkg/1.0.1/MODULE.bazel": "5b1df97dbc29623bccdf2b0dcd0f5cb08e2f2c9050aab1092fd39a41e82686ff",
"https://bcr.bazel.build/modules/rules_pkg/1.0.1/source.json": "bd82e5d7b9ce2d31e380dd9f50c111d678c3bdaca190cb76b0e1c71b05e1ba8a",
@@ -221,7 +219,7 @@
"@@aspect_bazel_lib~//lib:extensions.bzl%toolchains": {
"general": {
"bzlTransitiveDigest": "SK+5VjMKVX5gfuC//JqN+b1rWW3PNLeAEsqwiD3CAOA=",
- "usagesDigest": "+VCyT4l5J04U0/BfsKZCUI3iC3GbP0zTWvI8V+bV7cI=",
+ "usagesDigest": "O5SYkU/2Vp0DgNvgxLRwZPlkBfOcdgwaoM9nrNXFXT8=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
"envVariables": {},
@@ -784,75 +782,6 @@
]
}
},
- "@@container_structure_test~//:repositories.bzl%extension": {
- "general": {
- "bzlTransitiveDigest": "/vl5vOyGN/nxHtUF3SxoDZnTDgDklt4HUpLQD5LE8+k=",
- "usagesDigest": "YdEtAZuD+ZoX8k+fE/G6hwtEZQPYIYtZ8COmBRHB4Xo=",
- "recordedFileInputs": {},
- "recordedDirentsInputs": {},
- "envVariables": {},
- "generatedRepoSpecs": {
- "structure_test_st_linux_i386": {
- "bzlFile": "@@container_structure_test~//:repositories.bzl",
- "ruleClassName": "structure_test_repositories",
- "attributes": {
- "platform": "linux_i386"
- }
- },
- "structure_test_st_linux_s390x": {
- "bzlFile": "@@container_structure_test~//:repositories.bzl",
- "ruleClassName": "structure_test_repositories",
- "attributes": {
- "platform": "linux_s390x"
- }
- },
- "structure_test_st_linux_amd64": {
- "bzlFile": "@@container_structure_test~//:repositories.bzl",
- "ruleClassName": "structure_test_repositories",
- "attributes": {
- "platform": "linux_amd64"
- }
- },
- "structure_test_st_darwin_arm64": {
- "bzlFile": "@@container_structure_test~//:repositories.bzl",
- "ruleClassName": "structure_test_repositories",
- "attributes": {
- "platform": "darwin_arm64"
- }
- },
- "structure_test_st_windows_amd64": {
- "bzlFile": "@@container_structure_test~//:repositories.bzl",
- "ruleClassName": "structure_test_repositories",
- "attributes": {
- "platform": "windows_amd64"
- }
- },
- "structure_test_st_darwin_amd64": {
- "bzlFile": "@@container_structure_test~//:repositories.bzl",
- "ruleClassName": "structure_test_repositories",
- "attributes": {
- "platform": "darwin_amd64"
- }
- },
- "structure_test_toolchains": {
- "bzlFile": "@@container_structure_test~//bazel:toolchains_repo.bzl",
- "ruleClassName": "toolchains_repo",
- "attributes": {
- "toolchain_type": "@container_structure_test//bazel:structure_test_toolchain_type",
- "toolchain": "@structure_test_st_{platform}//:structure_test_toolchain"
- }
- },
- "structure_test_st_linux_arm64": {
- "bzlFile": "@@container_structure_test~//:repositories.bzl",
- "ruleClassName": "structure_test_repositories",
- "attributes": {
- "platform": "linux_arm64"
- }
- }
- },
- "recordedRepoMappingEntries": []
- }
- },
"@@googleapis~//:extensions.bzl%switched_rules": {
"general": {
"bzlTransitiveDigest": "vG6fuTzXD8MMvHWZEQud0MMH7eoC4GXY0va7VrFFh04=",
@@ -3463,19 +3392,16 @@
},
"@@rules_oci~//oci:extensions.bzl%oci": {
"general": {
- "bzlTransitiveDigest": "i4dSrvj1eBpPYJ3FNlAndMOeDAjQ4fPIwkJajJfx83I=",
- "usagesDigest": "kKDdI6ywEyDkUkQXzSCiKYlO+d45GL+x3ECd/FYK3ko=",
+ "bzlTransitiveDigest": "zUm52DVnw5ws3GB+XphdaaHTWhFsDSPNk6XtbsBkeFY=",
+ "usagesDigest": "7zs74sg8dglS19JIAh7RGIZ3CXNRxSLhnPwIEN7OisE=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
"envVariables": {},
"generatedRepoSpecs": {
- "oci_crane_registry_toolchains": {
- "bzlFile": "@@rules_oci~//oci/private:toolchains_repo.bzl",
- "ruleClassName": "toolchains_repo",
- "attributes": {
- "toolchain_type": "@rules_oci//oci:registry_toolchain_type",
- "toolchain": "@oci_crane_{platform}//:registry_toolchain"
- }
+ "bazel_features_version": {
+ "bzlFile": "@@bazel_features~//private:version_repo.bzl",
+ "ruleClassName": "version_repo",
+ "attributes": {}
},
"copy_to_directory_windows_amd64": {
"bzlFile": "@@aspect_bazel_lib~//lib/private:copy_to_directory_toolchain.bzl",
@@ -3484,19 +3410,6 @@
"platform": "windows_amd64"
}
},
- "jq": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:jq_toolchain.bzl",
- "ruleClassName": "jq_host_alias_repo",
- "attributes": {}
- },
- "oci_crane_darwin_amd64": {
- "bzlFile": "@@rules_oci~//oci:repositories.bzl",
- "ruleClassName": "crane_repositories",
- "attributes": {
- "platform": "darwin_amd64",
- "crane_version": "v0.18.0"
- }
- },
"jq_darwin_amd64": {
"bzlFile": "@@aspect_bazel_lib~//lib/private:jq_toolchain.bzl",
"ruleClassName": "jq_platform_repo",
@@ -3505,23 +3418,6 @@
"version": "1.7"
}
},
- "distroless_base": {
- "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
- "ruleClassName": "oci_alias",
- "attributes": {
- "target_name": "distroless_base",
- "scheme": "https",
- "registry": "gcr.io",
- "repository": "distroless/base",
- "identifier": "sha256:6c1e34e2f084fe6df17b8bceb1416f1e11af0fcdb1cef11ee4ac8ae127cb507c",
- "platforms": {
- "@@platforms//cpu:x86_64": "@distroless_base_linux_amd64",
- "@@platforms//cpu:arm64": "@distroless_base_linux_arm64_v8"
- },
- "bzlmod_repository": "distroless_base",
- "reproducible": true
- }
- },
"copy_to_directory_freebsd_amd64": {
"bzlFile": "@@aspect_bazel_lib~//lib/private:copy_to_directory_toolchain.bzl",
"ruleClassName": "copy_to_directory_platform_repo",
@@ -3529,26 +3425,6 @@
"platform": "freebsd_amd64"
}
},
- "distroless_base_linux_arm64_v8": {
- "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
- "ruleClassName": "oci_pull",
- "attributes": {
- "scheme": "https",
- "registry": "gcr.io",
- "repository": "distroless/base",
- "identifier": "sha256:6c1e34e2f084fe6df17b8bceb1416f1e11af0fcdb1cef11ee4ac8ae127cb507c",
- "platform": "linux/arm64/v8",
- "target_name": "distroless_base_linux_arm64_v8",
- "bazel_tags": []
- }
- },
- "copy_to_directory_linux_amd64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:copy_to_directory_toolchain.bzl",
- "ruleClassName": "copy_to_directory_platform_repo",
- "attributes": {
- "platform": "linux_amd64"
- }
- },
"oci_crane_linux_arm64": {
"bzlFile": "@@rules_oci~//oci:repositories.bzl",
"ruleClassName": "crane_repositories",
@@ -3573,20 +3449,11 @@
"version": "0.0.26"
}
},
- "coreutils_linux_amd64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:coreutils_toolchain.bzl",
- "ruleClassName": "coreutils_platform_repo",
+ "bsd_tar_linux_arm64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:tar_toolchain.bzl",
+ "ruleClassName": "bsdtar_binary_repo",
"attributes": {
- "platform": "linux_amd64",
- "version": "0.0.26"
- }
- },
- "yq_linux_amd64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:yq_toolchain.bzl",
- "ruleClassName": "yq_platform_repo",
- "attributes": {
- "platform": "linux_amd64",
- "version": "4.25.2"
+ "platform": "linux_arm64"
}
},
"copy_to_directory_linux_arm64": {
@@ -3596,19 +3463,19 @@
"platform": "linux_arm64"
}
},
- "oci_crane_linux_armv6": {
- "bzlFile": "@@rules_oci~//oci:repositories.bzl",
- "ruleClassName": "crane_repositories",
+ "oci_regctl_toolchains": {
+ "bzlFile": "@@rules_oci~//oci/private:toolchains_repo.bzl",
+ "ruleClassName": "toolchains_repo",
"attributes": {
- "platform": "linux_armv6",
- "crane_version": "v0.18.0"
+ "toolchain_type": "@rules_oci//oci:regctl_toolchain_type",
+ "toolchain": "@oci_regctl_{platform}//:regctl_toolchain"
}
},
- "copy_to_directory_darwin_arm64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:copy_to_directory_toolchain.bzl",
- "ruleClassName": "copy_to_directory_platform_repo",
+ "oci_regctl_windows_armv6": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "regctl_repositories",
"attributes": {
- "platform": "darwin_arm64"
+ "platform": "windows_armv6"
}
},
"oci_crane_linux_amd64": {
@@ -3635,26 +3502,13 @@
"version": "0.0.26"
}
},
- "coreutils_toolchains": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:coreutils_toolchain.bzl",
- "ruleClassName": "coreutils_toolchains_repo",
+ "zstd_linux_arm64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:zstd_toolchain.bzl",
+ "ruleClassName": "zstd_binary_repo",
"attributes": {
- "user_repository_name": "coreutils"
+ "platform": "linux_arm64"
}
},
- "yq_linux_s390x": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:yq_toolchain.bzl",
- "ruleClassName": "yq_platform_repo",
- "attributes": {
- "platform": "linux_s390x",
- "version": "4.25.2"
- }
- },
- "yq": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:yq_toolchain.bzl",
- "ruleClassName": "yq_host_alias_repo",
- "attributes": {}
- },
"oci_crane_darwin_arm64": {
"bzlFile": "@@rules_oci~//oci:repositories.bzl",
"ruleClassName": "crane_repositories",
@@ -3670,7 +3524,7 @@
"scheme": "https",
"registry": "gcr.io",
"repository": "distroless/base",
- "identifier": "sha256:6c1e34e2f084fe6df17b8bceb1416f1e11af0fcdb1cef11ee4ac8ae127cb507c",
+ "identifier": "sha256:6ae5fe659f28c6afe9cc2903aebc78a5c6ad3aaa3d9d0369760ac6aaea2529c8",
"platform": "linux/amd64",
"target_name": "distroless_base_linux_amd64",
"bazel_tags": []
@@ -3684,12 +3538,18 @@
"version": "1.7"
}
},
- "yq_darwin_amd64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:yq_toolchain.bzl",
- "ruleClassName": "yq_platform_repo",
+ "oci_regctl_linux_s390x": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "regctl_repositories",
"attributes": {
- "platform": "darwin_amd64",
- "version": "4.25.2"
+ "platform": "linux_s390x"
+ }
+ },
+ "oci_regctl_darwin_amd64": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "regctl_repositories",
+ "attributes": {
+ "platform": "darwin_amd64"
}
},
"oci_crane_linux_i386": {
@@ -3700,20 +3560,11 @@
"crane_version": "v0.18.0"
}
},
- "jq_linux_amd64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:jq_toolchain.bzl",
- "ruleClassName": "jq_platform_repo",
+ "oci_regctl_windows_amd64": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "regctl_repositories",
"attributes": {
- "platform": "linux_amd64",
- "version": "1.7"
- }
- },
- "yq_windows_amd64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:yq_toolchain.bzl",
- "ruleClassName": "yq_platform_repo",
- "attributes": {
- "platform": "windows_amd64",
- "version": "4.25.2"
+ "platform": "windows_amd64"
}
},
"oci_crane_windows_armv6": {
@@ -3732,6 +3583,254 @@
"toolchain": "@oci_crane_{platform}//:crane_toolchain"
}
},
+ "copy_to_directory_darwin_amd64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:copy_to_directory_toolchain.bzl",
+ "ruleClassName": "copy_to_directory_platform_repo",
+ "attributes": {
+ "platform": "darwin_amd64"
+ }
+ },
+ "zstd_darwin_arm64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:zstd_toolchain.bzl",
+ "ruleClassName": "zstd_binary_repo",
+ "attributes": {
+ "platform": "darwin_arm64"
+ }
+ },
+ "bsd_tar_linux_amd64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:tar_toolchain.bzl",
+ "ruleClassName": "bsdtar_binary_repo",
+ "attributes": {
+ "platform": "linux_amd64"
+ }
+ },
+ "oci_crane_windows_amd64": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "crane_repositories",
+ "attributes": {
+ "platform": "windows_amd64",
+ "crane_version": "v0.18.0"
+ }
+ },
+ "oci_regctl_linux_arm64": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "regctl_repositories",
+ "attributes": {
+ "platform": "linux_arm64"
+ }
+ },
+ "oci_crane_linux_s390x": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "crane_repositories",
+ "attributes": {
+ "platform": "linux_s390x",
+ "crane_version": "v0.18.0"
+ }
+ },
+ "zstd_linux_amd64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:zstd_toolchain.bzl",
+ "ruleClassName": "zstd_binary_repo",
+ "attributes": {
+ "platform": "linux_amd64"
+ }
+ },
+ "oci_regctl_darwin_arm64": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "regctl_repositories",
+ "attributes": {
+ "platform": "darwin_arm64"
+ }
+ },
+ "bsd_tar_windows_amd64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:tar_toolchain.bzl",
+ "ruleClassName": "bsdtar_binary_repo",
+ "attributes": {
+ "platform": "windows_amd64"
+ }
+ },
+ "jq": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:jq_toolchain.bzl",
+ "ruleClassName": "jq_host_alias_repo",
+ "attributes": {}
+ },
+ "oci_crane_darwin_amd64": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "crane_repositories",
+ "attributes": {
+ "platform": "darwin_amd64",
+ "crane_version": "v0.18.0"
+ }
+ },
+ "distroless_base": {
+ "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
+ "ruleClassName": "oci_alias",
+ "attributes": {
+ "target_name": "distroless_base",
+ "scheme": "https",
+ "registry": "gcr.io",
+ "repository": "distroless/base",
+ "identifier": "sha256:6ae5fe659f28c6afe9cc2903aebc78a5c6ad3aaa3d9d0369760ac6aaea2529c8",
+ "platforms": {
+ "@@platforms//cpu:x86_64": "@distroless_base_linux_amd64",
+ "@@platforms//cpu:armv7": "@distroless_base_linux_arm_v7",
+ "@@platforms//cpu:arm64": "@distroless_base_linux_arm64_v8",
+ "@@platforms//cpu:ppc": "@distroless_base_linux_ppc64le",
+ "@@platforms//cpu:s390x": "@distroless_base_linux_s390x"
+ },
+ "bzlmod_repository": "distroless_base",
+ "reproducible": true
+ }
+ },
+ "distroless_base_linux_arm64_v8": {
+ "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
+ "ruleClassName": "oci_pull",
+ "attributes": {
+ "scheme": "https",
+ "registry": "gcr.io",
+ "repository": "distroless/base",
+ "identifier": "sha256:6ae5fe659f28c6afe9cc2903aebc78a5c6ad3aaa3d9d0369760ac6aaea2529c8",
+ "platform": "linux/arm64/v8",
+ "target_name": "distroless_base_linux_arm64_v8",
+ "bazel_tags": []
+ }
+ },
+ "bsd_tar_darwin_arm64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:tar_toolchain.bzl",
+ "ruleClassName": "bsdtar_binary_repo",
+ "attributes": {
+ "platform": "darwin_arm64"
+ }
+ },
+ "copy_to_directory_linux_amd64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:copy_to_directory_toolchain.bzl",
+ "ruleClassName": "copy_to_directory_platform_repo",
+ "attributes": {
+ "platform": "linux_amd64"
+ }
+ },
+ "coreutils_linux_amd64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:coreutils_toolchain.bzl",
+ "ruleClassName": "coreutils_platform_repo",
+ "attributes": {
+ "platform": "linux_amd64",
+ "version": "0.0.26"
+ }
+ },
+ "bazel_skylib": {
+ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+ "ruleClassName": "http_archive",
+ "attributes": {
+ "sha256": "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
+ "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz"
+ ]
+ }
+ },
+ "oci_crane_linux_armv6": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "crane_repositories",
+ "attributes": {
+ "platform": "linux_armv6",
+ "crane_version": "v0.18.0"
+ }
+ },
+ "copy_to_directory_darwin_arm64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:copy_to_directory_toolchain.bzl",
+ "ruleClassName": "copy_to_directory_platform_repo",
+ "attributes": {
+ "platform": "darwin_arm64"
+ }
+ },
+ "distroless_base_linux_arm_v7": {
+ "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
+ "ruleClassName": "oci_pull",
+ "attributes": {
+ "scheme": "https",
+ "registry": "gcr.io",
+ "repository": "distroless/base",
+ "identifier": "sha256:6ae5fe659f28c6afe9cc2903aebc78a5c6ad3aaa3d9d0369760ac6aaea2529c8",
+ "platform": "linux/arm/v7",
+ "target_name": "distroless_base_linux_arm_v7",
+ "bazel_tags": []
+ }
+ },
+ "distroless_base_linux_s390x": {
+ "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
+ "ruleClassName": "oci_pull",
+ "attributes": {
+ "scheme": "https",
+ "registry": "gcr.io",
+ "repository": "distroless/base",
+ "identifier": "sha256:6ae5fe659f28c6afe9cc2903aebc78a5c6ad3aaa3d9d0369760ac6aaea2529c8",
+ "platform": "linux/s390x",
+ "target_name": "distroless_base_linux_s390x",
+ "bazel_tags": []
+ }
+ },
+ "coreutils_toolchains": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:coreutils_toolchain.bzl",
+ "ruleClassName": "coreutils_toolchains_repo",
+ "attributes": {
+ "user_repository_name": "coreutils"
+ }
+ },
+ "zstd_darwin_amd64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:zstd_toolchain.bzl",
+ "ruleClassName": "zstd_binary_repo",
+ "attributes": {
+ "platform": "darwin_amd64"
+ }
+ },
+ "zstd_toolchains": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:zstd_toolchain.bzl",
+ "ruleClassName": "zstd_toolchains_repo",
+ "attributes": {
+ "user_repository_name": "zstd"
+ }
+ },
+ "jq_linux_amd64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:jq_toolchain.bzl",
+ "ruleClassName": "jq_platform_repo",
+ "attributes": {
+ "platform": "linux_amd64",
+ "version": "1.7"
+ }
+ },
+ "bsd_tar_darwin_amd64": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:tar_toolchain.bzl",
+ "ruleClassName": "bsdtar_binary_repo",
+ "attributes": {
+ "platform": "darwin_amd64"
+ }
+ },
+ "oci_regctl_linux_amd64": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "regctl_repositories",
+ "attributes": {
+ "platform": "linux_amd64"
+ }
+ },
+ "bsd_tar_toolchains": {
+ "bzlFile": "@@aspect_bazel_lib~//lib/private:tar_toolchain.bzl",
+ "ruleClassName": "tar_toolchains_repo",
+ "attributes": {
+ "user_repository_name": "bsd_tar"
+ }
+ },
+ "distroless_base_linux_ppc64le": {
+ "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
+ "ruleClassName": "oci_pull",
+ "attributes": {
+ "scheme": "https",
+ "registry": "gcr.io",
+ "repository": "distroless/base",
+ "identifier": "sha256:6ae5fe659f28c6afe9cc2903aebc78a5c6ad3aaa3d9d0369760ac6aaea2529c8",
+ "platform": "linux/ppc64le",
+ "target_name": "distroless_base_linux_ppc64le",
+ "bazel_tags": []
+ }
+ },
"jq_windows_amd64": {
"bzlFile": "@@aspect_bazel_lib~//lib/private:jq_toolchain.bzl",
"ruleClassName": "jq_platform_repo",
@@ -3740,19 +3839,11 @@
"version": "1.7"
}
},
- "copy_to_directory_darwin_amd64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:copy_to_directory_toolchain.bzl",
- "ruleClassName": "copy_to_directory_platform_repo",
+ "oci_regctl_linux_i386": {
+ "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+ "ruleClassName": "regctl_repositories",
"attributes": {
- "platform": "darwin_amd64"
- }
- },
- "yq_linux_ppc64le": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:yq_toolchain.bzl",
- "ruleClassName": "yq_platform_repo",
- "attributes": {
- "platform": "linux_ppc64le",
- "version": "4.25.2"
+ "platform": "linux_i386"
}
},
"jq_toolchains": {
@@ -3769,35 +3860,22 @@
"user_repository_name": "copy_to_directory"
}
},
- "yq_darwin_arm64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:yq_toolchain.bzl",
- "ruleClassName": "yq_platform_repo",
- "attributes": {
- "platform": "darwin_arm64",
- "version": "4.25.2"
- }
- },
- "yq_toolchains": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:yq_toolchain.bzl",
- "ruleClassName": "yq_toolchains_repo",
- "attributes": {
- "user_repository_name": "yq"
- }
- },
- "oci_crane_windows_amd64": {
+ "oci_regctl_linux_armv6": {
"bzlFile": "@@rules_oci~//oci:repositories.bzl",
- "ruleClassName": "crane_repositories",
+ "ruleClassName": "regctl_repositories",
"attributes": {
- "platform": "windows_amd64",
- "crane_version": "v0.18.0"
+ "platform": "linux_armv6"
}
},
- "oci_crane_linux_s390x": {
- "bzlFile": "@@rules_oci~//oci:repositories.bzl",
- "ruleClassName": "crane_repositories",
+ "bazel_features_globals": {
+ "bzlFile": "@@bazel_features~//private:globals_repo.bzl",
+ "ruleClassName": "globals_repo",
"attributes": {
- "platform": "linux_s390x",
- "crane_version": "v0.18.0"
+ "globals": {
+ "RunEnvironmentInfo": "5.3.0",
+ "DefaultInfo": "0.0.1",
+ "__TestingOnly_NeverAvailable": "1000000000.0.0"
+ }
}
},
"coreutils_windows_amd64": {
@@ -3807,19 +3885,16 @@
"platform": "windows_amd64",
"version": "0.0.26"
}
- },
- "yq_linux_arm64": {
- "bzlFile": "@@aspect_bazel_lib~//lib/private:yq_toolchain.bzl",
- "ruleClassName": "yq_platform_repo",
- "attributes": {
- "platform": "linux_arm64",
- "version": "4.25.2"
- }
}
},
"moduleExtensionMetadata": {
"explicitRootModuleDirectDeps": [
- "distroless_base"
+ "distroless_base",
+ "distroless_base_linux_amd64",
+ "distroless_base_linux_arm_v7",
+ "distroless_base_linux_arm64_v8",
+ "distroless_base_linux_ppc64le",
+ "distroless_base_linux_s390x"
],
"explicitRootModuleDirectDevDeps": [],
"useAllRepos": "NO",
@@ -3832,12 +3907,22 @@
"bazel_tools"
],
[
+ "bazel_features~",
+ "bazel_tools",
+ "bazel_tools"
+ ],
+ [
"rules_oci~",
"aspect_bazel_lib",
"aspect_bazel_lib~"
],
[
"rules_oci~",
+ "bazel_features",
+ "bazel_features~"
+ ],
+ [
+ "rules_oci~",
"bazel_skylib",
"bazel_skylib~"
]
diff --git a/build/bazel/oci.MODULE.bazel b/build/bazel/oci.MODULE.bazel
index f8af291..f4fe7ce 100644
--- a/build/bazel/oci.MODULE.bazel
+++ b/build/bazel/oci.MODULE.bazel
@@ -1,11 +1,22 @@
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
oci.pull(
name = "distroless_base",
- digest = "sha256:6c1e34e2f084fe6df17b8bceb1416f1e11af0fcdb1cef11ee4ac8ae127cb507c",
+ digest = "sha256:6ae5fe659f28c6afe9cc2903aebc78a5c6ad3aaa3d9d0369760ac6aaea2529c8",
image = "gcr.io/distroless/base",
platforms = [
"linux/amd64",
+ "linux/arm/v7",
"linux/arm64/v8",
+ "linux/ppc64le",
+ "linux/s390x",
],
)
-use_repo(oci, "distroless_base")
+use_repo(
+ oci,
+ "distroless_base",
+ "distroless_base_linux_amd64",
+ "distroless_base_linux_arm64_v8",
+ "distroless_base_linux_arm_v7",
+ "distroless_base_linux_ppc64le",
+ "distroless_base_linux_s390x",
+)
diff --git a/metropolis/node/kubernetes/pause/BUILD.bazel b/metropolis/node/kubernetes/pause/BUILD.bazel
index b70d051..9bf992d 100644
--- a/metropolis/node/kubernetes/pause/BUILD.bazel
+++ b/metropolis/node/kubernetes/pause/BUILD.bazel
@@ -25,7 +25,7 @@
visibility = ["//visibility:private"],
)
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball")
+load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
oci_image(
name = "pause_image",
@@ -37,9 +37,16 @@
workdir = "/",
)
-oci_tarball(
- name = "pause_tarball",
+oci_load(
+ name = "pause_load",
image = ":pause_image",
repo_tags = ["preseed.metropolis.internal/node/kubernetes/pause:latest"],
+ visibility = ["//visibility:private"],
+)
+
+filegroup(
+ name = "pause_tarball",
+ srcs = [":pause_load"],
+ output_group = "tarball",
visibility = ["//metropolis/node:__pkg__"],
)
diff --git a/metropolis/test/e2e/httpserver/BUILD.bazel b/metropolis/test/e2e/httpserver/BUILD.bazel
index 160ebf8..5d60598 100644
--- a/metropolis/test/e2e/httpserver/BUILD.bazel
+++ b/metropolis/test/e2e/httpserver/BUILD.bazel
@@ -30,7 +30,7 @@
visibility = ["//visibility:private"],
)
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball")
+load("@rules_oci//oci:defs.bzl", "oci_image")
oci_image(
name = "httpserver_image",
@@ -40,10 +40,3 @@
visibility = ["//metropolis/test/e2e:__pkg__"],
workdir = "/app",
)
-
-oci_tarball(
- name = "httpserver_tarball",
- image = ":httpserver_image",
- repo_tags = ["bazel/metropolis/test/e2e/httpserver:httpserver_image"],
- visibility = ["//metropolis/test/e2e:__pkg__"],
-)
diff --git a/metropolis/test/e2e/preseedtest/BUILD.bazel b/metropolis/test/e2e/preseedtest/BUILD.bazel
index 864ba59..fe9fda9 100644
--- a/metropolis/test/e2e/preseedtest/BUILD.bazel
+++ b/metropolis/test/e2e/preseedtest/BUILD.bazel
@@ -31,7 +31,7 @@
visibility = ["//visibility:private"],
)
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball")
+load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
oci_image(
name = "preseedtest_image",
@@ -42,9 +42,16 @@
workdir = "/app",
)
-oci_tarball(
- name = "preseedtest_tarball",
+oci_load(
+ name = "preseedtest_load",
image = ":preseedtest_image",
repo_tags = ["bazel/metropolis/test/e2e/preseedtest:preseedtest_image"],
+ visibility = ["//visibility:private"],
+)
+
+filegroup(
+ name = "preseedtest_tarball",
+ srcs = [":preseedtest_load"],
+ output_group = "tarball",
visibility = ["//metropolis/node:__pkg__"],
)