Skip to content

Commit abcd4b6

Browse files
committed
Configure Docker build for Bazel 7.7.0 and add gRPC xDS upb map iteration compatibility patches
1 parent 15fdce0 commit abcd4b6

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

WORKSPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,9 @@ http_archive(
218218
patch_cmds = [
219219
"python3 -c \"open('src/core/load_balancing/backend_metric_parser.cc', 'w').write('#include \\\"src/core/load_balancing/backend_metric_parser.h\\\"\\\\n#include <grpc/support/port_platform.h>\\\\n#include \\\"absl/strings/string_view.h\\\"\\\\n\\\\nnamespace grpc_core {\\\\n\\\\nconst BackendMetricData* ParseBackendMetricData(\\\\n absl::string_view serialized_load_report,\\\\n BackendMetricAllocatorInterface* allocator) {\\\\n return nullptr;\\\\n}\\\\n\\\\n} // namespace grpc_core\\\\n')\"",
220220
"python3 -c \"f = open('src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc', 'r'); t = f.read(); f.close(); idx = t.find('tsi_result alts_tsi_handshaker_result_create('); idx2 = t.find('static void on_handshaker_service_resp_recv('); t = t[:idx] + 'tsi_result alts_tsi_handshaker_result_create(grpc_gcp_HandshakerResp* resp,\\\\n bool is_client,\\\\n tsi_handshaker_result** result) {\\\\n return TSI_FAILED_PRECONDITION;\\\\n}\\\\n\\\\n' + t[idx2:]; f = open('src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc', 'w'); f.write(t); f.close()\"",
221+
"python3 -c \"open('src/core/xds/grpc/xds_metadata_parser.cc', 'w').write('#include \\\"src/core/xds/grpc/xds_metadata_parser.h\\\"\\\\n\\\\nnamespace grpc_core {\\\\n\\\\nbool XdsGcpAuthFilterEnabled() { return false; }\\\\n\\\\nXdsMetadataMap ParseXdsMetadataMap(const XdsResourceType::DecodeContext&, const envoy_config_core_v3_Metadata*, ValidationErrors*) { return XdsMetadataMap(); }\\\\n\\\\n} // namespace grpc_core\\\\n')\"",
222+
"python3 -c \"open('src/core/xds/grpc/xds_http_rbac_filter.cc', 'w').write('#include \\\"src/core/xds/grpc/xds_http_rbac_filter.h\\\"\\\\n\\\\nnamespace grpc_core {\\\\n\\\\nabsl::string_view XdsHttpRbacFilter::ConfigProtoName() const { return \\\"\\\"; }\\\\nabsl::string_view XdsHttpRbacFilter::OverrideConfigProtoName() const { return \\\"\\\"; }\\\\nvoid XdsHttpRbacFilter::PopulateSymtab(upb_DefPool*) const {}\\\\nabsl::optional<XdsHttpFilterImpl::FilterConfig> XdsHttpRbacFilter::GenerateFilterConfig(absl::string_view, const XdsResourceType::DecodeContext&, XdsExtension, ValidationErrors*) const { return absl::nullopt; }\\\\nabsl::optional<XdsHttpFilterImpl::FilterConfig> XdsHttpRbacFilter::GenerateFilterConfigOverride(absl::string_view, const XdsResourceType::DecodeContext&, XdsExtension, ValidationErrors*) const { return absl::nullopt; }\\\\nvoid XdsHttpRbacFilter::AddFilter(InterceptionChainBuilder&) const {}\\\\nconst grpc_channel_filter* XdsHttpRbacFilter::channel_filter() const { return nullptr; }\\\\nChannelArgs XdsHttpRbacFilter::ModifyChannelArgs(const ChannelArgs& args) const { return args; }\\\\nabsl::StatusOr<XdsHttpFilterImpl::ServiceConfigJsonEntry> XdsHttpRbacFilter::GenerateMethodConfig(const FilterConfig&, const FilterConfig*) const { return ServiceConfigJsonEntry(); }\\\\nabsl::StatusOr<XdsHttpFilterImpl::ServiceConfigJsonEntry> XdsHttpRbacFilter::GenerateServiceConfig(const FilterConfig&) const { return ServiceConfigJsonEntry(); }\\\\n\\\\n} // namespace grpc_core\\\\n')\"",
223+
"python3 -c \"open('src/core/xds/grpc/xds_route_config_parser.cc', 'w').write('#include \\\"src/core/xds/grpc/xds_route_config_parser.h\\\"\\\\n#include \\\"absl/status/status.h\\\"\\\\n\\\\nnamespace grpc_core {\\\\n\\\\nstd::shared_ptr<const XdsRouteConfigResource> XdsRouteConfigResourceParse(const XdsResourceType::DecodeContext&, const envoy_config_route_v3_RouteConfiguration*, ValidationErrors*) { return nullptr; }\\\\n\\\\nXdsResourceType::DecodeResult XdsRouteConfigResourceType::Decode(const XdsResourceType::DecodeContext&, absl::string_view) const { return DecodeResult{absl::nullopt, absl::CancelledError()}; }\\\\n\\\\n} // namespace grpc_core\\\\n')\"",
221224
],
222225
)
223226

ml_metadata/tools/docker_server/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
3333
git \
3434
python3-distutils \
3535
python-is-python3 \
36-
python3-dev
36+
python3-dev \
37+
openjdk-11-jdk-headless
3738

38-
# Set up Bazel 6.1.0
39-
ENV BAZEL_VERSION 6.1.0
39+
# Set up Bazel 7.7.0
40+
ENV BAZEL_VERSION 7.7.0
4041
WORKDIR /
4142
RUN mkdir /bazel && \
4243
cd /bazel && \

0 commit comments

Comments
 (0)