Skip to content

Commit 38a4acc

Browse files
committed
roll back grpc and protobuf versions. Add clang-tidy. Install npm after grpc.
1 parent 66f983e commit 38a4acc

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.devcontainer/Dockerfile.dev

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,29 @@ ARG USER_UID=1000
88
ARG USER_GID=1000
99
ARG INSTALL_PACKAGES=
1010

11-
ARG GRPC_VERSION=v1.55.0
12-
ARG PROTOBUF_VERSION=23.4
11+
ARG CXX_STANDARD=14
12+
ARG GRPC_VERSION=v1.49.2
13+
ARG PROTOBUF_VERSION=21.3
1314
ARG ABSEIL_CPP_VERSION=20240116.1
1415

1516
ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
1617
ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION}
18+
ENV GRPC_VERSION=${GRPC_VERSION}
19+
ENV CXX_STANDARD=${CXX_STANDARD}
1720

1821
COPY ci /opt/ci
1922

2023
RUN apt update && apt install -y wget \
2124
ninja-build \
2225
libcurl4-openssl-dev \
23-
nodejs \
24-
npm \
26+
clang-tidy \
2527
shellcheck
2628

27-
RUN npm install -g markdownlint-cli
2829
RUN cd /opt/ci && bash setup_cmake.sh
2930
RUN cd /opt/ci && bash setup_ci_environment.sh
3031
RUN cd /opt && bash ci/setup_googletest.sh \
31-
&& bash ci/setup_grpc.sh -r ${GRPC_VERSION}
32+
&& bash ci/install_protobuf.sh \
33+
&& bash ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf
3234

3335
ADD https://github.com/bazelbuild/bazelisk/releases/download/v1.22.1/bazelisk-linux-amd64 /usr/local/bin
3436

@@ -43,5 +45,7 @@ ENV IS_CONTAINER_BUILD=true
4345
COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
4446
RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
4547

48+
RUN apt install -y npm && npm install -g markdownlint-cli
49+
4650
USER ${USER_NAME}
4751
CMD ["/bin/bash"]

.devcontainer/devcontainer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
"USER_UID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_UID:1000}",
1313
"USER_GID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_GID:1000}",
1414
"INSTALL_PACKAGES": "${localEnv:OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES:}",
15-
"GRPC_VERSION": "v1.55.0",
16-
"PROTOBUF_VERSION": "23.4",
15+
"CXX_STANDARD": "14",
16+
"GRPC_VERSION": "v1.49.2",
17+
"PROTOBUF_VERSION": "21.3",
1718
"ABSEIL_CPP_VERSION":"20240116.1"
1819
}
1920
},

0 commit comments

Comments
 (0)