Skip to content

Commit 7cba213

Browse files
authored
Merge branch 'dependabot-updates' into dependabot/docker_compose/tracker/test/load/otel/opentelemetry-collector-contrib-0.151.0
2 parents c045701 + 5a9a36d commit 7cba213

6 files changed

Lines changed: 15 additions & 14 deletions

File tree

.github/resources/coverity-requirements.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# SPDX-License-Identifier: Apache-2.0
33
# This file is licensed under Apache 2.0 License.
44

5-
pip == 26.0.1
6-
setuptools >= 78.1.1
7-
wheel == 0.46.3
8-
pybind11 == 3.0.3
5+
pip == 26.1
6+
setuptools >= 82.0.1
7+
8+
wheel == 0.47.0
9+
pybind11 == 3.0.4

.github/resources/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# SPDX-License-Identifier: Apache-2.0
33
# This file is licensed under Apache 2.0 License.
44

5-
pip == 26.0.1
5+
pip == 26.1
66
pytest == 9.0.3
77
numpy == 2.2.6
8-
selenium == 4.41.0
8+
selenium == 4.43.0
99
selenium-wire == 5.1.0
1010
blinker == 1.9.0
1111
pyvirtualdisplay == 3.0
1212
opencv-python == 4.13.0.92
13-
setuptools >= 78.1.1
13+
setuptools >= 82.0.1
1414
xmltodict == 1.0.4
1515
PyYAML >=6.0.1,<7.0
1616
pylint [spelling] == 4.0.5

cluster_analytics/requirements-build.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
# This file is licensed under Apache 2.0 License.
44

55
# Build-time dependencies with SHA256 hashes for supply chain security
6-
pybind11==3.0.3 \
7-
--hash=sha256:00471cdb816882c484708bc5dde80815c8c11cea540ab2cc6410f5ddea434755 \
8-
--hash=sha256:fb5f8e4a64946b4dcc0451c83a8c384f803bc0a62dd1ba02f199e97dbc9aad4c
6+
pybind11==3.0.4 \
7+
--hash=sha256:3286b59c8a774b9ee650169302dd5a4eedc30a8617905a0560dd8ee44775130c \
8+
--hash=sha256:961720ee652da51d531b7b2451a6bd2bc042b0106e6d9baa48ecb7d58034ce63

scene_common/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# -------------- Common Base Stage --------------
5-
FROM python:3.11-slim-bookworm@sha256:420310dd2ff7895895f0f1f9d15cae5a95dabceb8f1d6b9a23ef33c2c1c542c3 AS scenescape-common-base
5+
FROM python:3.11-slim-bookworm@sha256:ee710afcfb733f4a750d9be683cf054b5cd247b6c5f5237a6849ea568b90ab15 AS scenescape-common-base
66

77
# We use root for runtime init. The command in ENTRYPOINT will drop to an unprivileged user.
88
# hadolint ignore=DL3002

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/test/service/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ services:
7373
start_period: 2s
7474

7575
otel-collector:
76-
image: otel/opentelemetry-collector-contrib:0.149.0
76+
image: otel/opentelemetry-collector-contrib:0.151.0
7777
configs:
7878
- source: otel-config
7979
target: /etc/otelcol-contrib/config.yaml

0 commit comments

Comments
 (0)