diff --git a/MODULE.bazel b/MODULE.bazel index 3dd4634c..0cf24d2a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -6,7 +6,7 @@ module( compatibility_level = 1, ) -bazel_dep(name = "aspect_bazel_lib", version = "2.0.0-beta0") +bazel_dep(name = "aspect_bazel_lib", version = "2.0.0-rc0") bazel_dep(name = "bazel_skylib", version = "1.4.1") bazel_dep(name = "platforms", version = "0.0.5") diff --git a/oci/dependencies.bzl b/oci/dependencies.bzl index 52f6e5ff..747b6c55 100644 --- a/oci/dependencies.bzl +++ b/oci/dependencies.bzl @@ -29,7 +29,7 @@ def rules_oci_dependencies(): http_archive( name = "aspect_bazel_lib", - sha256 = "39ecbb25198950bab1cddc0f36e271f95a3e8bdb102c70e5c3ca6beb48602799", - strip_prefix = "bazel-lib-2.0.0-beta0", - url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.0.0-beta0/bazel-lib-v2.0.0-beta0.tar.gz", + sha256 = "91acfc0ef798d3c87639cbfdb6274845ad70edbddfd92e49ac70944f08f97f58", + strip_prefix = "bazel-lib-2.0.0-rc0", + url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.0.0-rc0/bazel-lib-v2.0.0-rc0.tar.gz", ) diff --git a/oci/private/tarball.sh.tpl b/oci/private/tarball.sh.tpl index 9bbfa4ff..ea66fd11 100644 --- a/oci/private/tarball.sh.tpl +++ b/oci/private/tarball.sh.tpl @@ -14,8 +14,7 @@ mtree=$(mktemp) function add_to_tar() { content=$1 tar_path=$2 - local mtree_flags="uid=0 gid=0 mode=0755 time=1672560000 type=file" - echo >>"${mtree}" "${tar_path} ${mtree_flags} content=${content}" + echo >>"${mtree}" "${tar_path} uid=0 gid=0 mode=0755 time=1672560000 type=file content=${content}" } MANIFEST_DIGEST=$(${YQ} eval '.manifests[0].digest | sub(":"; "/")' "${IMAGE_DIR}/index.json" | tr -d '"') @@ -42,7 +41,7 @@ layers="${LAYERS}" \ --null-input '.[0] = {"Config": env(config), "RepoTags": "${repo_tags}" | envsubst | split("%") | map(select(. != "")) , "Layers": env(layers) | map( "blobs/" + . + ".tar.gz") }' \ --output-format json > "${manifest_json}" -add_to_tar "${manifest_json}" "manifest.json" +add_to_tar "${manifest_json}@HOM" "manifest.json" # We've created the manifest, now hand it off to tar to create our final output "${TAR}" --create --file "${TARBALL_PATH}" "@${mtree}"