@@ -176,18 +176,34 @@ build-relwithdebinfo: dependencies-relwithdebinfo
176176TRACKER_SCHEMA_PATH ?= $(CURDIR ) /schema/config.schema.json
177177TRACKER_CONFIG_PATH ?= $(CURDIR ) /config/tracker.json
178178
179- # MQTT broker connection (auto-detect from test broker, fallback to 1883)
180- export TRACKER_MQTT_HOST ?= localhost
181- export TRACKER_MQTT_PORT ?= $(shell cd test/service && docker compose port broker 1883 2>/dev/null | cut -d : -f2 || echo 1883)
179+ # MQTT broker connection - preconfigured for SceneScape demo (docker compose up)
180+ # These variables are exported only in run/run-debug targets to avoid polluting test environment
181+ TRACKER_MQTT_HOST ?= localhost
182+ TRACKER_MQTT_PORT ?= $(shell cd test/service && docker compose port broker 1883 2>/dev/null | cut -d: -f2 || echo 1883)
183+ TRACKER_MQTT_INSECURE ?= false
182184
183- # Export empty proxy vars - Paho MQTT library fails with proxy env vars,
185+ # TLS CA certificate path (host path for native runs, container path set in tracker.json)
186+ TRACKER_TLS_CA_CERT_HOST ?= $(CURDIR ) /../manager/secrets/certs/scenescape-ca.pem
187+ TRACKER_MQTT_TLS_CA_CERT ?= $(TRACKER_TLS_CA_CERT_HOST )
188+
189+ # For insecure test broker: make run TRACKER_MQTT_INSECURE=true
190+
191+ # Export MQTT env vars and empty proxy vars - Paho MQTT library fails with proxy env vars,
184192# tracker code detects empty vars and unsets them (see mqtt_client.cpp)
185193run : build
186- export http_proxy= https_proxy= HTTP_PROXY= HTTPS_PROXY= && \
194+ export TRACKER_MQTT_HOST=" $( TRACKER_MQTT_HOST) " \
195+ TRACKER_MQTT_PORT=" $( TRACKER_MQTT_PORT) " \
196+ TRACKER_MQTT_INSECURE=" $( TRACKER_MQTT_INSECURE) " \
197+ TRACKER_MQTT_TLS_CA_CERT=" $( TRACKER_MQTT_TLS_CA_CERT) " \
198+ http_proxy= https_proxy= HTTP_PROXY= HTTPS_PROXY= && \
187199 . build/conanrun.sh && ./build/$(NAME ) --config $(TRACKER_CONFIG_PATH ) --schema $(TRACKER_SCHEMA_PATH )
188200
189201run-debug : build-debug
190- export http_proxy= https_proxy= HTTP_PROXY= HTTPS_PROXY= && \
202+ export TRACKER_MQTT_HOST=" $( TRACKER_MQTT_HOST) " \
203+ TRACKER_MQTT_PORT=" $( TRACKER_MQTT_PORT) " \
204+ TRACKER_MQTT_INSECURE=" $( TRACKER_MQTT_INSECURE) " \
205+ TRACKER_MQTT_TLS_CA_CERT=" $( TRACKER_MQTT_TLS_CA_CERT) " \
206+ http_proxy= https_proxy= HTTP_PROXY= HTTPS_PROXY= && \
191207 . build-debug/conanrun.sh && ./build-debug/$(NAME ) --config $(TRACKER_CONFIG_PATH ) --schema $(TRACKER_SCHEMA_PATH )
192208
193209# Profile with perf using optimized build with debug symbols.
@@ -319,8 +335,7 @@ test-service: build-image
319335 @test/service/.venv/bin/pip install -q --upgrade pip
320336 @test/service/.venv/bin/pip install -q -r test/service/requirements.txt
321337 @echo " Running service tests..."
322- unset TRACKER_MQTT_PORT TRACKER_MQTT_HOST TRACKER_MQTT_INSECURE && \
323- cd test/service && .venv/bin/pytest -v --tb=short
338+ cd test/service && .venv/bin/pytest -v --tb=short
324339
325340# ####################################################################
326341# Docker build targets
@@ -339,17 +354,21 @@ build-image-debug:
339354build-image-relwithdebinfo :
340355 $(MAKE ) build-image TARGET=runtime BUILD_TYPE=RelWithDebInfo IMAGE=scenescape-tracker-relwithdebinfo
341356
342- # Use host network to reach broker on localhost; empty proxy vars for Paho workaround
357+ # Use host network to reach broker; empty proxy vars for Paho workaround
358+ # Container uses secure defaults from tracker.json (TLS to broker.scenescape.intel.com)
343359run-image : build-image
344360 docker run --rm -it --network=host \
345361 -e http_proxy= -e https_proxy= -e HTTP_PROXY= -e HTTPS_PROXY= \
362+ -v $(TRACKER_TLS_CA_CERT_HOST ) :/run/secrets/certs/scenescape-ca.pem:ro \
346363 $(IMAGE ) :$(VERSION )
347364
348365run-image-debug : build-image-debug
349366 -docker stop tracker-debug 2> /dev/null || true
350367 -docker rm tracker-debug 2> /dev/null || true
351368 docker run --rm -d --name tracker-debug --init -p 2345:2345 \
352369 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined \
370+ -e http_proxy= -e https_proxy= -e HTTP_PROXY= -e HTTPS_PROXY= \
371+ -v $(TRACKER_TLS_CA_CERT_HOST ) :/run/secrets/certs/scenescape-ca.pem:ro \
353372 scenescape-tracker-debug:$(VERSION )
354373 @echo " Debug container started. Attach debugger to localhost:2345"
355374
0 commit comments