Improve libraries builds

opentracing-contrib · Sep 14, 2021 · 4ffce04 · 4ffce04
1 parent 3a4f5c0
commit 4ffce04
Showing 1 changed file with 111 additions and 46 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,125 +1,189 @@
 # syntax=docker/dockerfile:1.3
-FROM nginx:1.21.3 as build-base
+FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.0.0-rc.1 AS xx
+
+FROM --platform=$BUILDPLATFORM debian:buster as build-base
 
 RUN apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-    autoconf \
-    autogen \
-    automake \
     build-essential \
     ca-certificates \
-    cmake \
-    g++-7 \
+    clang \
     git \
     golang \
-    libcurl4-openssl-dev \
     libprotobuf-dev \
+    libcurl4 \
     libtool \
     libz-dev \
     pkg-config \
     protobuf-compiler \
+    libyaml-cpp-dev \
+    lld \
     wget
 
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 5 \
-    && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 5
+ENV CMAKE_VERSION 3.21.2
+RUN wget -q -O cmake-linux.sh "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(arch).sh" \
+    && sh cmake-linux.sh -- --skip-license --prefix=/usr \
+    && rm cmake-linux.sh
 
+COPY --from=xx / /
+ARG TARGETPLATFORM
 
-### Build gRPC
-FROM build-base as grpc
-ARG GRPC_VERSION=v1.27.x
+RUN xx-apt install -y zlib1g-dev xx-cxx-essentials libcurl4-openssl-dev libc-ares-dev libre2-dev libssl-dev libc-dev
 
-RUN git clone --depth 1 -b $GRPC_VERSION https://github.com/grpc/grpc \
-    && cd grpc \
-    && git submodule update --depth 1 --init \
-    && make HAS_SYSTEM_PROTOBUF=false \
-    && make install \
-    && cd third_party/protobuf \
-    && make install
+## Build gRPC
+FROM build-base as grpc
+ARG GRPC_VERSION=v1.40.x
+ARG TARGETPLATFORM
+
+RUN xx-info env && git clone --depth 1 -b $GRPC_VERSION https://github.com/grpc/grpc \
+    && cd grpc\
+    # Get absl
+    && git submodule update --depth 1 --init -- "third_party/abseil-cpp" \
+    # Get protobuf
+    && git submodule update --depth 1 --init -- "third_party/protobuf" \
+    && mkdir .build && cd .build \
+    && cmake $(xx-clang --print-cmake-defines) \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=ON \
+    -DgRPC_INSTALL=ON \
+    -DgRPC_BUILD_TESTS=OFF \
+    -DgRPC_ABSL_PROVIDER=module     \
+    -DgRPC_CARES_PROVIDER=package    \
+    -DgRPC_PROTOBUF_PROVIDER=module \
+    -DgRPC_RE2_PROVIDER=package      \
+    -DgRPC_SSL_PROVIDER=package      \
+    -DgRPC_ZLIB_PROVIDER=package \
+    .. \
+    && make -j$(nproc) install
 
 
 ### Build opentracing-cpp
 FROM build-base as opentracing-cpp
 ARG OPENTRACING_CPP_VERSION=v1.6.0
+ARG TARGETPLATFORM
 
-RUN git clone --depth 1 -b $OPENTRACING_CPP_VERSION https://github.com/opentracing/opentracing-cpp.git \
+RUN xx-info env && git clone --depth 1 -b $OPENTRACING_CPP_VERSION https://github.com/opentracing/opentracing-cpp.git \
     && cd opentracing-cpp \
     && mkdir .build && cd .build \
-    && cmake -DCMAKE_BUILD_TYPE=Release \
+    && cmake $(xx-clang --print-cmake-defines) \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=ON \
+    -DBUILD_STATIC_LIBS=ON \
+    -DBUILD_MOCKTRACER=OFF \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
     -DBUILD_TESTING=OFF .. \
-    && make && make install
+    && make -j$(nproc) install \
+    && xx-verify /usr/local/lib/libopentracing.so
 
 
 ### Build zipkin-cpp-opentracing
 FROM opentracing-cpp as zipkin-cpp-opentracing
 ARG ZIPKIN_CPP_VERSION=master
+ARG TARGETPLATFORM
 
-RUN apt-get --no-install-recommends --no-install-suggests -y install libcurl4-gnutls-dev
-
-RUN git clone --depth 1 -b $ZIPKIN_CPP_VERSION https://github.com/rnburn/zipkin-cpp-opentracing.git \
+RUN xx-info env && git clone --depth 1 -b $ZIPKIN_CPP_VERSION https://github.com/rnburn/zipkin-cpp-opentracing.git \
     && cd zipkin-cpp-opentracing \
     && mkdir .build && cd .build \
-    && cmake -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF .. \
-    && make && make install \
-    && ln -s /usr/local/lib/libzipkin_opentracing.so /usr/local/lib/libzipkin_opentracing_plugin.so
+    && cmake $(xx-clang --print-cmake-defines) \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DBUILD_STATIC_LIBS=OFF \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_PLUGIN=ON \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+    -DBUILD_TESTING=OFF .. \
+    && make -j$(nproc) install \
+    && xx-verify /usr/local/lib/libzipkin_opentracing_plugin.so
 
 
 ### Build Jaeger cpp-client
-FROM build-base as jaeger-cpp-client
+FROM opentracing-cpp as jaeger-cpp-client
 ARG JAEGER_CPP_VERSION=v0.8.0
+ARG YAML_CPP_VERSION=yaml-cpp-0.7.0
+ARG TARGETPLATFORM
+
+# Building yaml-cpp manually because of a bug in jaeger-client-cpp that won't install it
+RUN xx-info env && git clone --depth 1 -b $YAML_CPP_VERSION https://github.com/jbeder/yaml-cpp/ && \
+    cd yaml-cpp && mkdir .build && cd .build && \
+    cmake $(xx-clang --print-cmake-defines) \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DYAML_CPP_BUILD_TESTS=OFF \
+    -DYAML_CPP_BUILD_TOOLS=OFF \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON .. \
+    && make -j$(nproc) install \
+    && xx-verify /usr/local/lib/libyaml-cpp.so
 
 RUN git clone --depth 1 -b $JAEGER_CPP_VERSION https://github.com/jaegertracing/jaeger-client-cpp \
     && cd jaeger-client-cpp \
+    && sed -i 's/hunter_add_package(yaml-cpp)/#hunter_add_package(yaml-cpp)/' CMakeLists.txt \
+    && sed -i 's/yaml-cpp::yaml-cpp/yaml-cpp/' CMakeLists.txt \
+    # Hunter doesn't read CMake variables, so we need to set them manually
+    && printf "%s\n" "" "set(CMAKE_C_COMPILER clang)"  "set(CMAKE_CXX_COMPILER clang++)" \
+    "set(CMAKE_ASM_COMPILER clang)" "set(PKG_CONFIG_EXECUTABLE  $(xx-clang --print-prog-name=pkg-config))" \
+    "set(CMAKE_C_COMPILER_TARGET $(xx-clang --print-target-triple))" "set(CMAKE_CXX_COMPILER_TARGET $(xx-clang++ --print-target-triple))" \
+    "set(CMAKE_ASM_COMPILER_TARGET $(xx-clang --print-target-triple))" >>  cmake/toolchain.cmake \
     && mkdir .build \
     && cd .build \
-    && cmake -DCMAKE_BUILD_TYPE=Release \
+    && cmake $(xx-clang --print-cmake-defines) \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=OFF \
     -DBUILD_TESTING=OFF \
+    -DJAEGERTRACING_BUILD_EXAMPLES=OFF \
+    -DJAEGERTRACING_BUILD_CROSSDOCK=OFF \
+    -DJAEGERTRACING_COVERAGE=OFF \
+    -DJAEGERTRACING_PLUGIN=ON \
+    -DHUNTER_CONFIGURATION_TYPES=Release \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
     -DJAEGERTRACING_WITH_YAML_CPP=ON .. \
-    && make \
-    && make install \
+    && make -j$(nproc) install \
     && export HUNTER_INSTALL_DIR=$(cat _3rdParty/Hunter/install-root-dir) \
-    && cp $HUNTER_INSTALL_DIR/lib/libyaml*so /usr/local/lib/ \
     && mkdir /hunter \
     && cp -r $HUNTER_INSTALL_DIR/lib /hunter/ \
     && cp -r $HUNTER_INSTALL_DIR/include /hunter/ \
-    && ln -s /usr/local/lib/libjaegertracing.so /usr/local/lib/libjaegertracing_plugin.so
+    && mv libjaegertracing_plugin.so /usr/local/lib/libjaegertracing_plugin.so \
+    && xx-verify /usr/local/lib/libjaegertracing_plugin.so
 
 
 ### Build dd-opentracing-cpp
 FROM opentracing-cpp as dd-opentracing-cpp
 ARG DATADOG_VERSION=master
+ARG TARGETPLATFORM
 
-RUN git clone --depth 1 -b $DATADOG_VERSION https://github.com/DataDog/dd-opentracing-cpp.git \
+RUN xx-info env && git clone --depth 1 -b $DATADOG_VERSION https://github.com/DataDog/dd-opentracing-cpp.git \
     && cd dd-opentracing-cpp \
+    && sed -i 's/cmake/cmake \$(xx-clang --print-cmake-defines)/I' scripts/install_dependencies.sh \
     && scripts/install_dependencies.sh not-opentracing not-curl not-zlib \
     && mkdir .build && cd .build \
-    && cmake -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF .. \
-    && make && make install \
-    && ln -s /usr/local/lib/libdd_opentracing.so /usr/local/lib/libdd_opentracing_plugin.so
+    && cmake  $(xx-clang --print-cmake-defines) \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+    -DBUILD_TESTING=OFF .. \
+    && make -j$(nproc) install \
+    && ln -s /usr/local/lib/libdd_opentracing.so /usr/local/lib/libdd_opentracing_plugin.so \
+    && xx-verify /usr/local/lib/libdd_opentracing_plugin.so
 
 
 ### Build nginx-opentracing modules
-FROM build-base as build-nginx
+FROM nginx:1.21.3 as build-nginx
 
 COPY --from=jaeger-cpp-client /hunter /hunter
-
 COPY . /src
 
 RUN echo "deb-src http://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list \
     && apt-get update \
     && apt-get build-dep -y nginx
 
-RUN wget -O nginx-release-${NGINX_VERSION}.tar.gz https://github.com/nginx/nginx/archive/release-${NGINX_VERSION}.tar.gz \
-    && tar zxf nginx-release-${NGINX_VERSION}.tar.gz \
+RUN curl -sSL -O https://github.com/nginx/nginx/archive/release-${NGINX_VERSION}.tar.gz \
+    && tar zxf release-${NGINX_VERSION}.tar.gz \
     && cd nginx-release-${NGINX_VERSION} \
-    && NGINX_MODULES_PATH=$(nginx -V 2>&1 | grep -oP "modules-path=\K[^\s]*") \
     && auto/configure \
     --with-compat \
     --add-dynamic-module=/src/opentracing \
     --with-cc-opt="-I/hunter/include" \
-    --with-ld-opt="-L/hunter/lib" \
+    --with-ld-opt="-fPIE -fPIC -Wl,-z,relro -Wl,-z,now -L/hunter/lib" \
     --with-debug \
     && make modules \
-    && cp objs/ngx_http_opentracing_module.so $NGINX_MODULES_PATH/
+    && cp objs/ngx_http_opentracing_module.so /usr/lib/nginx/modules/
 
 
 ### Build final image
@@ -130,6 +194,7 @@ COPY --from=dd-opentracing-cpp /usr/local/lib/ /usr/local/lib/
 COPY --from=jaeger-cpp-client /usr/local/lib/ /usr/local/lib/
 COPY --from=zipkin-cpp-opentracing /usr/local/lib/ /usr/local/lib/
 COPY --from=opentracing-cpp /usr/local/lib/ /usr/local/lib/
-COPY --from=grpc /usr/local/lib/ /usr/local/lib/
+# gRPC doesn't seem to be used
+# COPY --from=grpc /usr/local/lib/ /usr/local/lib/
 
 STOPSIGNAL SIGTERM