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.

Sign up for GitHub

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

Jump to bottom

fix(bazel): alternate method of installing bazelisk in docker image #6041

Merged
merged 1 commit into from
Mar 6, 2024
Merged

fix(bazel): alternate method of installing bazelisk in docker image #6041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 0 additions & 20 deletions external.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,24 +1815,6 @@ def _bindings():
actual = "@maven//:com_google_errorprone_error_prone_annotations",
)

def _extractor_image_dependencies():
"""Defines external repositories necessary for extractor images."""
go_repository(
name = "com_github_bazelbuild_bazelisk",
importpath = "github.com/bazelbuild/bazelisk",
tag = "v1.3.0",
)
go_repository(
name = "com_github_mitchellh_go_homedir",
importpath = "github.com/mitchellh/go-homedir",
tag = "v1.1.0",
)
go_repository(
name = "com_github_hashicorp_go_version",
importpath = "github.com/hashicorp/go-version",
tag = "v1.1.0",
)

def kythe_dependencies():
"""Defines external repositories for Kythe dependencies.

Expand All @@ -1848,8 +1830,6 @@ def kythe_dependencies():
_rule_dependencies()
hedron_compile_commands_setup()

_extractor_image_dependencies()

maybe(
http_file,
name = "bazel_toolchains_rbe_gen_config_linux_amd64",
Expand Down
2 changes: 0 additions & 2 deletions kythe/extractors/bazel/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ docker_build(
"extract.sh",
"//kythe/release",
"//kythe/release/base:fix_permissions.sh",
"@com_github_bazelbuild_bazelisk//:bazelisk",
],
image_name = "gcr.io/kythe-public/bazel-extractor",
tags = ["manual"],
Expand All @@ -23,7 +22,6 @@ docker_build(
"extract.sh",
"//kythe/release",
"//kythe/release/base:fix_permissions.sh",
"@com_github_bazelbuild_bazelisk//:bazelisk",
],
image_name = "gcr.io/kythe-public/bazel-extractor",
stage_only = True,
Expand Down
10 changes: 7 additions & 3 deletions kythe/extractors/bazel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN apt-get update -y && \
# This is temporary until Debian starts shipping merged /usr directories in their images
apt-mark hold usrmerge usr-is-merged && \
apt-get upgrade -y && \
apt-get install -y git clang-15 build-essential zip python3 openjdk-17-jdk-headless && \
apt-get install -y git clang-15 build-essential zip python3 openjdk-17-jdk-headless curl && \
apt-get clean

# Create clang symlinks
Expand All @@ -41,8 +41,12 @@ ADD kythe/extractors/bazel/extract.sh /kythe/
ADD kythe/extractors/bazel/bazel_wrapper.sh /kythe/
ADD kythe/release/base/fix_permissions.sh /kythe/

# Bazelisk
ADD external/com_github_bazelbuild_bazelisk/bazelisk_/bazelisk /kythe/
# Fetch the latest version of Bazelisk for AMD64 Linux from GitHub
RUN curl -s https://api.github.com/repos/bazelbuild/bazelisk/releases/latest \
| sed -n '/browser_download_url/s/[^:]*:[^"]*\("[^"]*"\).*/url = \1/p' \
| grep bazelisk-linux-amd64 \
| curl -L -o /kythe/bazelisk -K - \
&& chmod +x /kythe/bazelisk

RUN mkdir -p /workspace
WORKDIR /workspace
Expand Down