Skip to content

[gnmi] Migrate gnmi, telemetry, and watchdog containers to Debian Trixie #25957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sigabrtv1-ui wants to merge 6 commits into from
Closed

[gnmi] Migrate gnmi, telemetry, and watchdog containers to Debian Trixie #25957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba60414
[gnmi] Migrate docker-sonic-gnmi, docker-gnmi-sidecar, and docker-gnm…
hdwhdw Mar 8, 2026
b5bb680
[gnmi] Migrate docker-telemetry-watchdog to Debian Trixie
hdwhdw Mar 9, 2026
46eafe2
[gnmi] Migrate docker-sonic-telemetry to Debian Trixie
hdwhdw Mar 9, 2026
3ab684d
Update sonic-gnmi submodule to include buildvcs fix (#622)
hdwhdw Mar 18, 2026
b710dcf
Merge remote-tracking branch 'origin/master' into gnmi-migrate-to-trixie
hdwhdw Mar 26, 2026
6a7c7e5
Update trixie FIPS version to include Golang FIPS fix
hdwhdw Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/docker-gnmi-sidecar/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% from "dockers/dockerfile-macros.j2" import rsync_from_builder_stage %}
ARG BASE=docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
ARG BASE=docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}

FROM $BASE AS base

Expand Down
4 changes: 2 additions & 2 deletions dockers/docker-gnmi-watchdog/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} AS builder
FROM docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} AS builder

# Update apt's cache of available packages
RUN apt-get update && apt-get install -y \
Expand All @@ -18,7 +18,7 @@ COPY watchdog/ ./
# Build from within /watchdog
RUN cargo build --release

FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
FROM docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}

ARG docker_container_name
ARG image_version
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-sonic-gnmi/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files, rsync_from_builder_stage %}
ARG BASE=docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
ARG BASE=docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}

FROM $BASE AS base

Expand Down
6 changes: 3 additions & 3 deletions rules/docker-gnmi-sidecar.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ DOCKER_GNMI_SIDECAR_STEM = docker-gnmi-sidecar
DOCKER_GNMI_SIDECAR = $(DOCKER_GNMI_SIDECAR_STEM).gz
DOCKER_GNMI_SIDECAR_DBG = $(DOCKER_GNMI_SIDECAR_STEM)-$(DBG_IMAGE_MARK).gz

$(DOCKER_GNMI_SIDECAR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BOOKWORM)
$(DOCKER_GNMI_SIDECAR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_TRIXIE)

$(DOCKER_GNMI_SIDECAR)_PATH = $(DOCKERS_PATH)/$(DOCKER_GNMI_SIDECAR_STEM)

$(DOCKER_GNMI_SIDECAR)_VERSION = 1.0.0
$(DOCKER_GNMI_SIDECAR)_PACKAGE_NAME = gnmi-sidecar

SONIC_DOCKER_IMAGES += $(DOCKER_GNMI_SIDECAR)
SONIC_BOOKWORM_DOCKERS += $(DOCKER_GNMI_SIDECAR)
SONIC_TRIXIE_DOCKERS += $(DOCKER_GNMI_SIDECAR)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_GNMI_SIDECAR)

SONIC_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_SIDECAR_DBG)
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_GNMI_SIDECAR_DBG)
SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_GNMI_SIDECAR_DBG)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_SIDECAR_DBG)


Expand Down
6 changes: 3 additions & 3 deletions rules/docker-gnmi-watchdog.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ DOCKER_GNMI_WATCHDOG_STEM = docker-gnmi-watchdog
DOCKER_GNMI_WATCHDOG = $(DOCKER_GNMI_WATCHDOG_STEM).gz
DOCKER_GNMI_WATCHDOG_DBG = $(DOCKER_GNMI_WATCHDOG_STEM)-$(DBG_IMAGE_MARK).gz

$(DOCKER_GNMI_WATCHDOG)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BOOKWORM)
$(DOCKER_GNMI_WATCHDOG)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_TRIXIE)

$(DOCKER_GNMI_WATCHDOG)_PATH = $(DOCKERS_PATH)/$(DOCKER_GNMI_WATCHDOG_STEM)

$(DOCKER_GNMI_WATCHDOG)_VERSION = 1.0.0
$(DOCKER_GNMI_WATCHDOG)_PACKAGE_NAME = gnmi_watchdog

SONIC_DOCKER_IMAGES += $(DOCKER_GNMI_WATCHDOG)
SONIC_BOOKWORM_DOCKERS += $(DOCKER_GNMI_WATCHDOG)
SONIC_TRIXIE_DOCKERS += $(DOCKER_GNMI_WATCHDOG)
ifeq ($(INCLUDE_SYSTEM_GNMI), y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_GNMI_WATCHDOG)
endif

SONIC_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_WATCHDOG_DBG)
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_GNMI_WATCHDOG_DBG)
SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_GNMI_WATCHDOG_DBG)
ifeq ($(INCLUDE_SYSTEM_GNMI), y)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_WATCHDOG_DBG)
endif
Expand Down
10 changes: 5 additions & 5 deletions rules/docker-gnmi.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ $(DOCKER_GNMI)_PATH = $(DOCKERS_PATH)/$(DOCKER_GNMI_STEM)

$(DOCKER_GNMI)_DEPENDS += $(SONIC_MGMT_COMMON)
$(DOCKER_GNMI)_DEPENDS += $(SONIC_TELEMETRY)
$(DOCKER_GNMI)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)
$(DOCKER_GNMI)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_TRIXIE)_DBG_DEPENDS)

$(DOCKER_GNMI)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM)
$(DOCKER_GNMI)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_TRIXIE)

$(DOCKER_GNMI)_VERSION = 1.0.0
$(DOCKER_GNMI)_PACKAGE_NAME = gnmi

$(DOCKER_GNMI)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE_PACKAGES)
$(DOCKER_GNMI)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_TRIXIE)_DBG_IMAGE_PACKAGES)

# Ensure docker-telemetry-watchdog (which uses a docker-sonic-gnmi-based image)
# is built before the docker-sonic-gnmi debug image, because the debug image build removes
# its docker-sonic-gnmi base image during cleanup.
$(DOCKER_GNMI_DBG)_AFTER += $(DOCKER_TELEMETRY_WATCHDOG)

SONIC_DOCKER_IMAGES += $(DOCKER_GNMI)
SONIC_BOOKWORM_DOCKERS += $(DOCKER_GNMI)
SONIC_TRIXIE_DOCKERS += $(DOCKER_GNMI)
Comment on lines 22 to +26
Copy link

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$(DOCKER_GNMI_DBG)_AFTER += $(DOCKER_TELEMETRY_WATCHDOG) now points at a docker image that is still categorized as Bookworm-only (see rules/docker-telemetry-watchdog.mk), so when building with BLDENV=trixie there may be no rule to produce target/docker-telemetry-watchdog.gz, causing the GNMI debug image build to fail. Consider either migrating docker-telemetry-watchdog to Trixie as part of this change, or making this _AFTER dependency conditional so it only applies when the dependency image is part of the current DOCKER_IMAGES set.

Copilot uses AI. Check for mistakes.
ifeq ($(INCLUDE_SYSTEM_GNMI), y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_GNMI)
endif
Comment on lines 25 to 29
Copy link

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After moving $(DOCKER_GNMI) into SONIC_TRIXIE_DOCKERS, Bookworm builds can break because Bookworm containers (e.g., docker-sonic-telemetry and docker-telemetry-watchdog) declare _LOAD_DOCKERS =/+= $(DOCKER_GNMI). With BLDENV=bookworm, $(DOCKER_GNMI) is no longer in DOCKER_IMAGES, so target/docker-sonic-gnmi.gz may have no build rule even though other Bookworm images still require it. Either migrate the dependent telemetry images to Trixie in the same PR, or keep a Bookworm GNMI image available (e.g., separate variable/target or conditional base selection) until dependents are migrated.

Copilot uses AI. Check for mistakes.

SONIC_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_DBG)
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_GNMI_DBG)
SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_GNMI_DBG)
ifeq ($(INCLUDE_SYSTEM_GNMI), y)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_DBG)
endif
Expand Down
4 changes: 2 additions & 2 deletions rules/docker-telemetry-watchdog.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ $(DOCKER_TELEMETRY_WATCHDOG)_VERSION = 1.0.0
$(DOCKER_TELEMETRY_WATCHDOG)_PACKAGE_NAME = telemetry_watchdog

SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY_WATCHDOG)
SONIC_BOOKWORM_DOCKERS += $(DOCKER_TELEMETRY_WATCHDOG)
SONIC_TRIXIE_DOCKERS += $(DOCKER_TELEMETRY_WATCHDOG)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TELEMETRY_WATCHDOG)

SONIC_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_WATCHDOG_DBG)
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_TELEMETRY_WATCHDOG_DBG)
SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_TELEMETRY_WATCHDOG_DBG)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_WATCHDOG_DBG)

$(DOCKER_TELEMETRY_WATCHDOG)_CONTAINER_NAME = telemetry_watchdog
Expand Down
4 changes: 2 additions & 2 deletions rules/docker-telemetry.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ $(DOCKER_TELEMETRY)_PACKAGE_NAME = telemetry
$(DOCKER_TELEMETRY)_DBG_IMAGE_PACKAGES = $($(DOCKER_GNMI)_DBG_IMAGE_PACKAGES)

SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY)
SONIC_BOOKWORM_DOCKERS += $(DOCKER_TELEMETRY)
SONIC_TRIXIE_DOCKERS += $(DOCKER_TELEMETRY)
ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TELEMETRY)
endif

SONIC_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG)
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_TELEMETRY_DBG)
SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_TELEMETRY_DBG)
ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG)
endif
Expand Down
2 changes: 1 addition & 1 deletion rules/sonic-fips.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


ifeq ($(BLDENV), trixie)
FIPS_VERSION = 1.8.0-24-gd744cf2
FIPS_VERSION = 1.8.0-24-gd744cf2-2
FIPS_OPENSSL_VERSION = 3.5.4-1+fips
FIPS_OPENSSH_VERSION = 10.0p1-7+fips
FIPS_PYTHON_MAIN_VERSION = 3.13
Expand Down
Loading