void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-08-02 23:12:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

only build otlp stuff for central controllers
Some checks are pending
/ build_macos (push) Waiting to run
Details
/ build_windows (push) Waiting to run
Details
/ build_ubuntu (push) Waiting to run
Details

Browse source
This commit is contained in:
Grant Limberg 2025-07-11 14:47:58 -07:00
parent 7f835b414a
commit 5c3daca2a0
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/central-controller-docker/Dockerfile.builder
View file

@ -16,8 +16,16 @@ RUN apt -y install \
postgresql-client \ postgresql-client \
postgresql-client-common \ postgresql-client-common \
curl \ curl \
libcurl4-openssl-dev \
google-perftools \ google-perftools \
libgoogle-perftools-dev \ 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 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

4
ext/central-controller-docker/Dockerfile.run_base
View file

@ -13,5 +13,7 @@ RUN apt -y install \
binutils \ binutils \
perf-tools-unstable \ perf-tools-unstable \
google-perftools \ google-perftools \
gnupg gnupg \
libgrpc++1.51 \
libgrpc29

4
make-linux.mk
View file

@ -430,7 +430,7 @@ doc: manpages
ifeq (${ZT_OTEL},1) ifeq (${ZT_OTEL},1)
otel: 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 cd ext/opentelemetry-cpp-1.21.0/build && make install
else else
otel: otel:
@ -458,7 +458,7 @@ _buildx:
@echo docker buildx inspect --bootstrap @echo docker buildx inspect --bootstrap
central-controller: FORCE central-controller: FORCE
make -j4 ZT_CONTROLLER=1 one make -j4 ZT_CONTROLLER=1 ZT_OTEL=1 one
central-controller-docker: _buildx FORCE 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 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