[pull] main from open-telemetry:main

docker/Dockerfile

@@ -1,35 +1,70 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-ARG BASE_IMAGE=ubuntu:latest
-ARG GRPC_IMAGE=grpc-${BASE_IMAGE}
-
-FROM ${GRPC_IMAGE} as grpc
+ARG BASE_IMAGE=ubuntu-latest
 
 FROM base-${BASE_IMAGE}-dev AS otel-cpp
 
 ARG CORES=${nproc}
-ARG OTEL_GIT_TAG=v1.3.0
+ARG OTEL_GIT_TAG="main"
+ARG OTEL_THIRDPARTY_TAGS_FILE="third_party_release"
+ARG OTEL_CMAKE_OPTIONS_CACHE_FILE="test_common/cmake/all-options-abiv1.cmake"
+ARG CXX_STANDARD=17
+ARG OTEL_THIRDPARTY_BUILD_TYPE="Release"
+ARG OTEL_BUILD_TYPE="Release"
+ARG OTEL_BUILD_SHARED_LIBS="ON"
+ARG OTEL_INSTALL_DIR="/opt/opentelemetry-cpp-install"
 
-COPY --from=grpc / /usr/local
+ENV OTEL_GIT_TAG=${OTEL_GIT_TAG}
+ENV OTEL_THIRDPARTY_TAGS_FILE=${OTEL_THIRDPARTY_TAGS_FILE}
+ENV OTEL_CMAKE_OPTIONS_CACHE_FILE=${OTEL_CMAKE_OPTIONS_CACHE_FILE}
+ENV CXX_STANDARD=${CXX_STANDARD}
+ENV OTEL_THIRDPARTY_BUILD_TYPE=${OTEL_THIRDPARTY_BUILD_TYPE}
+ENV OTEL_BUILD_TYPE=${OTEL_BUILD_TYPE}
+ENV OTEL_BUILD_SHARED_LIBS=${OTEL_BUILD_SHARED_LIBS}
 
-#install opentelemetry-cpp
+ENV OTEL_SRC_DIR="/tmp/opentelemetry-cpp"
+ENV OTEL_BUILD_DIR="/tmp/opentelemetry-cpp-build"
+ENV OTEL_THIRDPARTY_BUILD_DIR="/tmp/opentelemetry-cpp-third-party-build"
+ENV OTEL_INSTALL_DIR=${OTEL_INSTALL_DIR}
+
+# clone the source
 RUN git clone --recurse-submodules -j ${CORES} --depth=1 \
-    -b ${OTEL_GIT_TAG} https://github.com/open-telemetry/opentelemetry-cpp.git \
-    && cd opentelemetry-cpp \
-    && mkdir -p build && cd build \
+    -b ${OTEL_GIT_TAG} https://github.com/open-telemetry/opentelemetry-cpp.git ${OTEL_SRC_DIR}
+
+#install third party dependencies
+RUN mkdir -p ${OTEL_THIRDPARTY_BUILD_DIR} \
+   && cmake \
+   -S "${OTEL_SRC_DIR}/install/cmake" \
+   -B "${OTEL_THIRDPARTY_BUILD_DIR}" \
+   "-DCMAKE_INSTALL_PREFIX=${OTEL_INSTALL_DIR}" \
+   "-DCMAKE_CXX_STANDARD=${CXX_STANDARD}" \
+   "-DCMAKE_CXX_STANDARD_REQUIRED=ON" \
+   "-DCMAKE_CXX_EXTENSIONS=OFF" \
+   "-DCMAKE_BUILD_TYPE=${OTEL_THIRDPARTY_BUILD_TYPE}" \
+   "-DOTELCPP_THIRDPARTY_TAGS_FILE=${OTEL_THIRDPARTY_TAGS_FILE}" \
+   && cmake --build "${OTEL_THIRDPARTY_BUILD_DIR}" --clean-first -j ${CORES}
+
+#install opentelemetry-cpp
+RUN mkdir -p ${OTEL_BUILD_DIR} \
     && cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE  \
-        -DWITH_ZIPKIN=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/third_party/install \
-        -DBUILD_TESTING=OFF \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        -DBUILD_SHARED_LIBS=ON \
-        .. \
-    && cmake --build . -j ${CORES} --target install
-
-FROM scratch as final
-
-COPY --from=otel-cpp /opt/third_party/install /
+        -S "${OTEL_SRC_DIR}" \
+        -B "${OTEL_BUILD_DIR}" \
+        -C "${OTEL_SRC_DIR}/${OTEL_CMAKE_OPTIONS_CACHE_FILE}" \
+        "-DCMAKE_INSTALL_PREFIX=${OTEL_INSTALL_DIR}" \
+        "-DCMAKE_PREFIX_PATH=${OTEL_INSTALL_DIR}" \
+        "-DCMAKE_BUILD_TYPE=${OTEL_BUILD_TYPE}" \
+        "-DCMAKE_CXX_STANDARD=${CXX_STANDARD}" \
+        "-DCMAKE_CXX_STANDARD_REQUIRED=ON" \
+        "-DCMAKE_CXX_EXTENSIONS=OFF" \
+        "-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE" \
+        "-DBUILD_TESTING=OFF" \
+        "-DBUILD_EXAMPLES=OFF" \
+        "-DBUILD_SHARED_LIBS=${OTEL_BUILD_SHARED_LIBS}" \
+    && cmake --build "${OTEL_BUILD_DIR}" -j ${CORES} --target install
+
+FROM scratch AS final
+
+ARG OTEL_INSTALL_DIR
+
+COPY --from=otel-cpp ${OTEL_INSTALL_DIR} /

docker/Dockerfile.alpine-latest.base

@@ -0,0 +1,16 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+ARG BASE_IMAGE=alpine:latest@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412
+
+FROM ${BASE_IMAGE} AS final
+
+RUN apk update
+
+RUN apk add --update alpine-sdk \
+    && apk add cmake g++ \
+    git autoconf libtool linux-headers \
+    openssl openssl-dev \
+    libevent-dev
+
+WORKDIR /work