diff --git a/ext/central-controller-docker/Dockerfile.builder b/ext/central-controller-docker/Dockerfile.builder index e96a61995..14a3b7698 100644 --- a/ext/central-controller-docker/Dockerfile.builder +++ b/ext/central-controller-docker/Dockerfile.builder @@ -16,8 +16,16 @@ RUN apt -y install \ postgresql-client \ postgresql-client-common \ curl \ + libcurl4-openssl-dev \ google-perftools \ libgoogle-perftools-dev \ - protobuf-compiler + protobuf-compiler \ + protobuf-compiler-grpc \ + grpc-proto \ + libgrpc++1.51 \ + libgrpc++-dev \ + libgrpc-dev \ + libgrpc29 + RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/ext/central-controller-docker/Dockerfile.run_base b/ext/central-controller-docker/Dockerfile.run_base index 606ebfcfb..fb5d0e2d5 100644 --- a/ext/central-controller-docker/Dockerfile.run_base +++ b/ext/central-controller-docker/Dockerfile.run_base @@ -13,5 +13,7 @@ RUN apt -y install \ binutils \ perf-tools-unstable \ google-perftools \ - gnupg + gnupg \ + libgrpc++1.51 \ + libgrpc29 diff --git a/make-linux.mk b/make-linux.mk index e3b1eab9b..e0e3fc45a 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -430,7 +430,7 @@ doc: manpages ifeq (${ZT_OTEL},1) otel: - cd ext/opentelemetry-cpp-1.21.0 && mkdir -p localinstall && cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(shell pwd)/ext/opentelemetry-cpp-1.21.0/localinstall -DBUILD_TESTING=OFF -DOPENTELEMETRY_INSTALL=ON -DWITH_BENCHMARK=OFF -DWITH_EXAMPLES=OFF -DWITH_FUNC_TESTS=OFF + cd ext/opentelemetry-cpp-1.21.0 && mkdir -p localinstall && cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(shell pwd)/ext/opentelemetry-cpp-1.21.0/localinstall -DBUILD_TESTING=OFF -DOPENTELEMETRY_INSTALL=ON -DWITH_BENCHMARK=OFF -DWITH_EXAMPLES=OFF -DWITH_FUNC_TESTS=OFF -DUSE_THIRDPARTY_LIBRARIES=ON -DWITH_OTLP_GRPC=ON -DWITH_OTLP_HTTP=OFF -DWITH_PROMETHEUS=OFF cd ext/opentelemetry-cpp-1.21.0/build && make install else otel: @@ -458,7 +458,7 @@ _buildx: @echo docker buildx inspect --bootstrap central-controller: FORCE - make -j4 ZT_CONTROLLER=1 one + make -j4 ZT_CONTROLLER=1 ZT_OTEL=1 one central-controller-docker: _buildx FORCE docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile --build-arg git_branch=`git name-rev --name-only HEAD` . --push