Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: renaming bazel targets #557

Merged
merged 2 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ repos:
- --match=.*

- repo: https://github.com/PyCQA/pylint
rev: v2.17.7
rev: v3.2.5
hooks:
- id: pylint
name: pylint
Expand Down
14 changes: 3 additions & 11 deletions Cargo.Bazel.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "982c13a29a128a09b521a6a2a453103ab8aea1f631648c92e4ca6072ed60a065",
"checksum": "d5d33d6454b8f860b5027bd8ef2ec6082f348be768b504ee6f55c78dd00704bc",
"crates": {
"actix-codec 0.5.2": {
"name": "actix-codec",
Expand Down Expand Up @@ -28893,35 +28893,29 @@
],
"crate_features": {
"common": [
"elf",
"errno",
"general",
"ioctl",
"no_std"
],
"selects": {
"aarch64-unknown-linux-gnu": [
"elf",
"errno",
"prctl",
"std",
"system"
],
"arm-unknown-linux-gnueabi": [
"elf",
"errno",
"prctl",
"std",
"system"
],
"armv7-unknown-linux-gnueabi": [
"elf",
"errno",
"prctl",
"std",
"system"
],
"i686-unknown-linux-gnu": [
"elf",
"errno",
"prctl",
"std",
"system"
Expand All @@ -28937,8 +28931,6 @@
"system"
],
"x86_64-unknown-linux-gnu": [
"elf",
"errno",
"prctl",
"std",
"system"
Expand Down
6 changes: 3 additions & 3 deletions k8s/oci_images.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def python_oci_image_rules(name, src, base_image = "@distroless_python3"):
base_image: base image for building py binaries
"""
binary = native.package_relative_label(src)
tar_rule_name = "{}_layer".format(binary.name)
tar_rule_name = "tar"
pkg_tar(
name = tar_rule_name,
srcs = [binary],
Expand All @@ -27,7 +27,7 @@ def python_oci_image_rules(name, src, base_image = "@distroless_python3"):
}
)

image_rule_name = "{}-image".format(binary.name)
image_rule_name = "image"
oci_image(
name = image_rule_name,
# Consider using even more minimalistic docker image since we're using static compile
Expand All @@ -39,7 +39,7 @@ def python_oci_image_rules(name, src, base_image = "@distroless_python3"):
}
)

tarball_name = "{}-tarball".format(binary.name)
tarball_name = "tarball"
oci_tarball(
name = tarball_name,
image = image_rule_name,
Expand Down
6 changes: 3 additions & 3 deletions rs/oci_images.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ def rust_binary_oci_image_rules(name, src, base_image = "@distroless_cc_debian12
other_layers: optional of other layers to be added, e.g. deb packages
"""
binary = native.package_relative_label(src)
tar_rule_name = "{}_layer".format(binary.name)
tar_rule_name = "tar"
pkg_tar(
name = tar_rule_name,
srcs = [binary],
)

image_rule_name = "{}-image".format(binary.name)
image_rule_name = "image"
oci_image(
name = image_rule_name,
# Consider using even more minimalistic docker image since we're using static compile
Expand All @@ -30,7 +30,7 @@ def rust_binary_oci_image_rules(name, src, base_image = "@distroless_cc_debian12
tars = [tar_rule_name] + other_layers,
)

tarball_name = "{}-tarball".format(binary.name)
tarball_name = "tarball"
oci_tarball(
name = tarball_name,
image = image_rule_name,
Expand Down
Loading