Skip to content

Commit b9bc2dc

Browse files
authored
Merge branch 'tracker-dependencies-updates' into dependabot/docker_compose/tracker/test/service/otel/opentelemetry-collector-contrib-0.151.0
2 parents 20c750c + b7b6d9d commit b9bc2dc

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

tracker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ARG RUNTIME_OS_IMAGE=gcr.io/distroless/cc-debian13@sha256:d7ac2f9af248f31fe6270002755722afdf6875e0e49cd52b9150208e6a23875c
55

66
# --- Build stage ---
7-
FROM debian:13-slim@sha256:26f98ccd92fd0a44d6928ce8ff8f4921b4d2f535bfa07555ee5d18f61429cf0c AS builder
7+
FROM debian:13-slim@sha256:cedb1ef40439206b673ee8b33a46a03a0c9fa90bf3732f54704f99cb061d2c5a AS builder
88

99
WORKDIR /scenescape
1010

@@ -96,7 +96,7 @@ HEALTHCHECK --interval=10s --timeout=5s --start-period=10s --retries=3 \
9696
CMD ["/scenescape/tracker", "--config", "/scenescape/config/tracker.json", "--schema", "/scenescape/schema/config.schema.json"]
9797

9898
# --- Debug stage (for development with gdbserver) ---
99-
FROM debian:13-slim@sha256:26f98ccd92fd0a44d6928ce8ff8f4921b4d2f535bfa07555ee5d18f61429cf0c AS debug
99+
FROM debian:13-slim@sha256:cedb1ef40439206b673ee8b33a46a03a0c9fa90bf3732f54704f99cb061d2c5a AS debug
100100

101101
# hadolint ignore=DL3008
102102
RUN apt-get update -qq \

tracker/conanfile.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
[requires]
5-
quill/11.0.2
6-
cli11/2.6.0
5+
quill/11.1.0
6+
cli11/2.6.2
77
cpp-httplib/0.39.0
8-
rapidjson/cci.20250205
8+
rapidjson/cci.20200410
99
gtest/1.17.0
1010
stduuid/1.2.3
1111
opencv/4.12.0
12-
eigen/3.4.0
12+
eigen/3.4.1
1313
paho-mqtt-cpp/1.5.3
1414
opentelemetry-cpp/1.18.0
1515

tracker/test/load/Dockerfile.k6

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Copyright (C) 2026 Intel Corporation
33

44
# Build k6 with the xk6-mqtt extension for MQTT load testing.
5-
# xk6 Docker tag 1.3.7 bundles xk6 Go module v1.3.7.
6-
# See: https://github.com/grafana/xk6/releases/tag/v1.3.7
7-
FROM grafana/xk6:1.3.7@sha256:a5543f005b660458843738a1b571d490ac1ea3d2b9a58375fec8553b196ac011 AS builder
5+
# xk6 Docker tag 1.4.0 bundles xk6 Go module v1.4.0.
6+
# See: https://github.com/grafana/xk6/releases/tag/v1.4.0
7+
FROM grafana/xk6:1.4.0@sha256:3a3d4b02be2ebffa693f98c6699071a082a6b47ab106c6ba1ac72e15f7550b88 AS builder
88
ARG http_proxy
99
ARG https_proxy
1010
ARG no_proxy

tracker/test/load/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
- load-test
3232

3333
otel-collector:
34-
image: otel/opentelemetry-collector-contrib:0.149.0
34+
image: otel/opentelemetry-collector-contrib:0.151.0
3535
hostname: otel-collector
3636
command: ["--config=/etc/otel-config.yaml"]
3737
ports:

0 commit comments

Comments
 (0)