|
@@ -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
|