chore(bazel): upgrade to latest rules_oci 1.x (#63085)

Upgrades rules_oci from `1.4.3` to `1.7.6`, the latest 1.x release of
rules_oci before upgrading to rules_oci 2.x. Upgrading directly from
`1.4.3` to `2.0.0` is big a jump, because a lot has changed in between.

Signed-off-by: thesayyn <thesayyn@gmail.com>

## Test plan

I don't expect any breaking changes. Also, I am assuming the repo
already has a test coverage for containers built with rules_oci.


## Changelog
This commit is contained in:
Sahin Yort 2024-06-05 07:35:37 -07:00 committed by GitHub
parent 4a93f29755
commit 1425097105
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 18 deletions

View File

@ -106,13 +106,9 @@ http_archive(
# Container rules
http_archive(
name = "rules_oci",
patch_args = ["-p1"],
patches = [
"//third_party/rules_oci:no_xattr.patch",
],
sha256 = "d41d0ba7855f029ad0e5ee35025f882cbe45b0d5d570842c52704f7a47ba8668",
strip_prefix = "rules_oci-1.4.3",
url = "https://github.com/bazel-contrib/rules_oci/releases/download/v1.4.3/rules_oci-v1.4.3.tar.gz",
sha256 = "647f4c6fd092dc7a86a7f79892d4b1b7f1de288bdb4829ca38f74fd430fcd2fe",
strip_prefix = "rules_oci-1.7.6",
url = "https://github.com/bazel-contrib/rules_oci/releases/download/v1.7.6/rules_oci-v1.7.6.tar.gz",
)
http_archive(

View File

@ -1 +0,0 @@
exports_files(glob(["*.patch"]))

View File

@ -1,10 +0,0 @@
diff --git a/oci/private/tarball.sh.tpl b/oci/private/tarball.sh.tpl
index 2b5052f..d22fef3 100644
--- a/oci/private/tarball.sh.tpl
+++ b/oci/private/tarball.sh.tpl
@@ -137,4 +137,4 @@ layers="${LAYERS}" \
--output-format json > "${STAGING_DIR}/manifest.json"
# TODO: https://github.com/bazel-contrib/rules_oci/issues/217
-tar -C "${STAGING_DIR}" -cf "${TARBALL_PATH}" manifest.json blobs
+tar --no-xattrs -C "${STAGING_DIR}" -cf "${TARBALL_PATH}" manifest.json blobs