Skip to content

Commit

Permalink
chore: remove bazel 5 workaround
Browse files Browse the repository at this point in the history
Bazel-lib 2.0 doesn't include this anymore
  • Loading branch information
alexeagle committed Oct 10, 2023
1 parent 18b5c2e commit 8036ab1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")

rules_js_dependencies()

load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "aspect_bazel_lib_register_toolchains")

# Workaround for Bazel 5 support
aspect_bazel_lib_dependencies(override_local_config_platform = True)
aspect_bazel_lib_dependencies()

aspect_bazel_lib_register_toolchains()

load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")

Expand Down
2 changes: 1 addition & 1 deletion oci/private/tarball.sh.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,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}@HOM" "manifest.json"
add_to_tar "${manifest_json}" "manifest.json"

# We've created the manifest, now hand it off to tar to create our final output
"${TAR}" --create --file "${TARBALL_PATH}" "@${mtree}"

0 comments on commit 8036ab1

Please sign in to comment.