From 42f6a232fc803fea0fd1b3d9e12c6486656efe3e Mon Sep 17 00:00:00 2001 From: Douglas Barker Date: Fri, 4 Apr 2025 12:15:31 -0600 Subject: [PATCH 1/2] expose cmake version setting as docker arg and env var for the devcontainer --- .devcontainer/Dockerfile.dev | 2 ++ .devcontainer/devcontainer.json | 1 + 2 files changed, 3 insertions(+) diff --git a/.devcontainer/Dockerfile.dev b/.devcontainer/Dockerfile.dev index 6e19e32f8e..1d38ce9f21 100644 --- a/.devcontainer/Dockerfile.dev +++ b/.devcontainer/Dockerfile.dev @@ -8,11 +8,13 @@ ARG USER_GID=1000 ARG INSTALL_PACKAGES= ARG CXX_STANDARD=17 +ARG CMAKE_VERSION=3.31.6 ARG ABSEIL_CPP_VERSION=20230125.3 ARG PROTOBUF_VERSION=23.3 ARG GRPC_VERSION=v1.55.0 ENV CXX_STANDARD=${CXX_STANDARD} +ENV CMAKE_VERSION=${CMAKE_VERSION} ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION} ENV PROTOBUF_VERSION=${PROTOBUF_VERSION} ENV GRPC_VERSION=${GRPC_VERSION} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 98a0eec74c..8087122423 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -11,6 +11,7 @@ "USER_UID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_UID:1000}", "USER_GID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_GID:1000}", "INSTALL_PACKAGES": "${localEnv:OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES:}", + "CMAKE_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_CMAKE_VERSION:3.31.6}", "CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}", "GRPC_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_GRPC_VERSION:v1.55.0}", "PROTOBUF_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION:23.3}", From f6719b58522222adb1204e3bae904fe5741d7b74 Mon Sep 17 00:00:00 2001 From: Douglas Barker Date: Fri, 4 Apr 2025 12:19:56 -0600 Subject: [PATCH 2/2] update devcontainer readme --- .devcontainer/README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.devcontainer/README.md b/.devcontainer/README.md index 2844f58341..bea6f8c4d5 100644 --- a/.devcontainer/README.md +++ b/.devcontainer/README.md @@ -3,6 +3,13 @@ Customize your dev container using build arguments (for direct Docker builds) or environment variables (for evaluation in `devcontainer.json`). +* **CMake version:** + The version of cmake to install. (Default: 3.31.6) + * Docker ARG: + `CMAKE_VERSION` + * Host Environment Variable: + `OTEL_CPP_DEVCONTAINER_CMAKE_VERSION` + * **CXX standard:** This is the C++ standard to build from (eg: 17, 20, ...). (Default: 17) * Docker ARG: