Skip to content

Commit af673b9

Browse files
committed
Update the devcontainer to use the new install_thirdparty script.
1 parent 6142a74 commit af673b9

File tree

3 files changed

+5
-36
lines changed

3 files changed

+5
-36
lines changed

.devcontainer/Dockerfile.dev

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,22 @@ ARG INSTALL_PACKAGES=
99

1010
ARG CXX_STANDARD=17
1111
ARG CMAKE_VERSION=3.31.6
12-
ARG ABSEIL_CPP_VERSION=20230125.3
13-
ARG PROTOBUF_VERSION=23.3
14-
ARG GRPC_VERSION=v1.55.0
1512

1613
ENV CXX_STANDARD=${CXX_STANDARD}
1714
ENV CMAKE_VERSION=${CMAKE_VERSION}
18-
ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION}
19-
ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
20-
ENV GRPC_VERSION=${GRPC_VERSION}
2115

2216
COPY ci /opt/ci
2317

2418
RUN apt update && apt install -y wget \
2519
ninja-build \
2620
llvm-dev \
2721
libclang-dev \
28-
libcurl4-openssl-dev \
2922
clang-tidy \
3023
shellcheck
3124

3225
RUN cd /opt/ci && bash setup_cmake.sh
3326
RUN cd /opt/ci && bash setup_ci_environment.sh
3427
RUN cd /opt/ci && bash install_iwyu.sh
35-
RUN cd /opt && bash ci/setup_googletest.sh \
36-
&& bash ci/install_abseil.sh \
37-
&& bash ci/install_protobuf.sh \
38-
&& bash ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
3928

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

@@ -48,14 +37,17 @@ ENV USER_UID=${USER_UID}
4837
ENV USER_GID=${USER_GID}
4938
ENV IS_CONTAINER_BUILD=true
5039

40+
COPY install /opt/install
5141
COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
5242
RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
5343
RUN apt install -y npm && npm install -g [email protected]
5444

5545
USER devuser
5646

5747
WORKDIR /workspaces/opentelemetry-cpp
48+
RUN cd /opt && bash ci/install_thirdparty.sh /home/devuser/third-party/install-stable install/cmake/third_party_stable
49+
ENV CMAKE_PREFIX_PATH=/home/devuser/third-party/install-stable
5850

5951
ENTRYPOINT []
6052

61-
CMD ["/bin/bash"]
53+
CMD ["/bin/bash"]

.devcontainer/README.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,6 @@ environment variables (for evaluation in `devcontainer.json`).
1717
* Host Environment Variable:
1818
`OTEL_CPP_DEVCONTAINER_CXX_STANDARD`
1919

20-
* **abseil-cpp version:**
21-
This is the version of abseil-cpp that will be used to build protobuf, gRPC,
22-
and opentelemetry-cpp.
23-
* Docker ARG:
24-
`ABSEIL_CPP_VERSION`
25-
* Host Environment Variable:
26-
`OTEL_CPP_DEVCONTAINER_ABSEIL_CPP_VERSION`
27-
28-
* **Protobuf version:**
29-
* Docker ARG:
30-
`PROTOBUF_VERSION`
31-
* Host Environment Variable:
32-
`OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION`
33-
34-
* **gRPC version:**
35-
* Docker ARG:
36-
`GRPC_VERSION`
37-
* Host Environment Variable:
38-
`OTEL_CPP_DEVCONTAINER_GRPC_VERSION`
39-
4020
* **User ID (UID):**
4121
User ID (Default: `1000`)
4222
* Docker ARG:

.devcontainer/devcontainer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
"USER_GID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_GID:1000}",
1313
"INSTALL_PACKAGES": "${localEnv:OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES:}",
1414
"CMAKE_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_CMAKE_VERSION:3.31.6}",
15-
"CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}",
16-
"GRPC_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_GRPC_VERSION:v1.55.0}",
17-
"PROTOBUF_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION:23.3}",
18-
"ABSEIL_CPP_VERSION":"${localEnv:OTEL_CPP_DEVCONTAINER_ABSEIL_CPP_VERSION:20230125.3}"
15+
"CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}"
1916
}
2017
},
2118
"customizations": {

0 commit comments

Comments
 (0)