Skip to content

Commit b6908f0

Browse files
authored
[DEVCONTAINER] expose cmake version setting as docker arg and environment variable (#3347)
* expose cmake version setting as docker arg and env var for the devcontainer * update devcontainer readme
1 parent 4a0d19f commit b6908f0

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

.devcontainer/Dockerfile.dev

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ ARG USER_GID=1000
88
ARG INSTALL_PACKAGES=
99

1010
ARG CXX_STANDARD=17
11+
ARG CMAKE_VERSION=3.31.6
1112
ARG ABSEIL_CPP_VERSION=20230125.3
1213
ARG PROTOBUF_VERSION=23.3
1314
ARG GRPC_VERSION=v1.55.0
1415

1516
ENV CXX_STANDARD=${CXX_STANDARD}
17+
ENV CMAKE_VERSION=${CMAKE_VERSION}
1618
ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION}
1719
ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
1820
ENV GRPC_VERSION=${GRPC_VERSION}

.devcontainer/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
Customize your dev container using build arguments (for direct Docker builds) or
44
environment variables (for evaluation in `devcontainer.json`).
55

6+
* **CMake version:**
7+
The version of cmake to install. (Default: 3.31.6)
8+
* Docker ARG:
9+
`CMAKE_VERSION`
10+
* Host Environment Variable:
11+
`OTEL_CPP_DEVCONTAINER_CMAKE_VERSION`
12+
613
* **CXX standard:**
714
This is the C++ standard to build from (eg: 17, 20, ...). (Default: 17)
815
* Docker ARG:

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"USER_UID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_UID:1000}",
1212
"USER_GID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_GID:1000}",
1313
"INSTALL_PACKAGES": "${localEnv:OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES:}",
14+
"CMAKE_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_CMAKE_VERSION:3.31.6}",
1415
"CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}",
1516
"GRPC_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_GRPC_VERSION:v1.55.0}",
1617
"PROTOBUF_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION:23.3}",

0 commit comments

Comments
 (0)