[gnmi] Migrate docker-sonic-gnmi, docker-gnmi-sidecar, and docker-gnmi-watchdog to Debian Trixie

Update base image references from docker-config-engine-bookworm to
docker-config-engine-trixie for all three gnmi-related containers.
Move them from SONIC_BOOKWORM_DOCKERS to SONIC_TRIXIE_DOCKERS to
align with the ongoing container migration to Debian 13 (Trixie).

This follows the same pattern as PR sonic-net#25942 (Brcm containers migrate
to trixie) and builds on the Trixie base layers added in PR sonic-net#25184.

Signed-off-by: Dawei Huang <[email protected]>

Author: hdwhdw

dockers/docker-gnmi-sidecar/Dockerfile.j2

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

dockers/docker-gnmi-watchdog/Dockerfile.j2

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

dockers/docker-sonic-gnmi/Dockerfile.j2

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

rules/docker-gnmi-sidecar.mk

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

rules/docker-gnmi-watchdog.mk

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

rules/docker-gnmi.mk

@@ -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)
 ifeq ($(INCLUDE_SYSTEM_GNMI), y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_GNMI)
 endif
 
 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