File tree Expand file tree Collapse file tree 2 files changed +16
-14
lines changed
Expand file tree Collapse file tree 2 files changed +16
-14
lines changed Original file line number Diff line number Diff line change 11FROM otel/cpp_format_tools
22
33ARG GRPC_VERSION=v1.55.0
4+ ARG PROTOBUF_VERSION=23.4
5+ ARG ABSEIL_CPP_VERSION=20240116.1
46
5- COPY ci/setup_googletest.sh /opt/ci/setup_googletest.sh
6- COPY ci/setup_ci_environment.sh /opt/ci/setup_ci_environment.sh
7- COPY ci/setup_cmake.sh /opt/ci/setup_cmake.sh
8- COPY ci/install_abseil.sh /opt/ci/install_abseil.sh
9- COPY ci/install_protobuf.sh /opt/ci/install_protobuf.sh
10- COPY ci/setup_grpc.sh /opt/ci/setup_grpc.sh
11- COPY ci/fix-abseil-cpp-issue-1536.patch /opt/ci/fix-abseil-cpp-issue-1536.patch
7+ ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
8+ ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION}
9+
10+ COPY ci /opt/ci
1211
1312RUN apt update && apt install -y wget \
1413 ninja-build \
1514 libcurl4-openssl-dev
1615
17- RUN cd /opt/ci && bash setup_ci_environment.sh
1816RUN cd /opt/ci && bash setup_cmake.sh
17+ RUN cd /opt/ci && bash setup_ci_environment.sh
1918RUN cd /opt && bash ci/setup_googletest.sh \
20- && bash ci/install_abseil.sh \
21- && bash ci/install_protobuf.sh \
22- && bash ci/setup_grpc.sh -p protobuf -p abseil-cpp -r ${GRPC_VERSION}
19+ && bash ci/setup_grpc.sh -r ${GRPC_VERSION}
2320
2421ADD https://github.com/bazelbuild/bazelisk/releases/download/v1.22.1/bazelisk-linux-amd64 /usr/local/bin
2522
Original file line number Diff line number Diff line change 55 "build" : {
66 "context" : " .." ,
77 "dockerfile" : " Dockerfile.dev" ,
8- "args" : { "GRPC_VERSION" : " v1.55.0" }
8+ "args" : {
9+ "GRPC_VERSION" : " v1.55.0" ,
10+ "PROTOBUF_VERSION" : " 23.4" ,
11+ "ABSEIL_CPP_VERSION" :" 20240116.1"
12+ }
913 },
10- // Set *default* container specific settings.json values on container create.
1114 "settings" : {
1215 "terminal.integrated.shell.linux" : " /bin/sh"
1316 },
1417 "extensions" : [
15- " ms-vscode.cpptools"
18+ " ms-vscode.cpptools" ,
19+ " ms-azuretools.vscode-docker" ,
20+ " ms-vscode.cpptools-extension-pack"
1621 ],
1722
1823 "remoteUser" : " root"
You can’t perform that action at this time.
0 commit comments