Upgrade mux docker container from bookworm to trixie#26543
Upgrade mux docker container from bookworm to trixie#26543yxieca wants to merge 2 commits intosonic-net:masterfrom
Conversation
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Pull request overview
Migrates the mux (linkmgrd) Docker container from Debian bookworm to trixie to align it with other trixie-based containers.
Changes:
- Switch
dockers/docker-mux/Dockerfile.j2base image todocker-config-engine-trixie. - Update
rules/docker-mux.mkto use trixie config-engine debug deps/image packages and to classify mux underSONIC_TRIXIE_*_DOCKERSrather thanSONIC_BOOKWORM_*_DOCKERS.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| rules/docker-mux.mk | Points mux’s debug deps/image packages/load-dockers at the trixie config-engine image and reclassifies mux as a trixie docker. |
| dockers/docker-mux/Dockerfile.j2 | Changes the mux container base image from config-engine bookworm to config-engine trixie. |
| @@ -29,8 +29,8 @@ SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG) | |||
| SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG) | |||
| endif | |||
|
|
|||
There was a problem hiding this comment.
Moving docker-mux from SONIC_BOOKWORM_DOCKERS to SONIC_TRIXIE_DOCKERS makes target/docker-mux.gz no longer buildable when BLDENV=bookworm (since slave.mk selects DOCKER_IMAGES := $(SONIC_BOOKWORM_DOCKERS) for bookworm builds). If someone sets INCLUDE_MUX=y in a bookworm build environment, the build will likely fail with “No rule to make target target/docker-mux.gz”. If bookworm builds are still supported, consider keeping mux in the bookworm docker lists (temporarily) or updating the build selection logic to allow building trixie docker images when BLDENV=bookworm.
| SONIC_BOOKWORM_DOCKERS += $(DOCKER_MUX) | |
| SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_MUX_DBG) |
Migrate the mux (linkmgrd) docker container from Debian bookworm to trixie, aligning it with other containers already on trixie. Changes: - Update Dockerfile.j2 base image from bookworm to trixie - Update docker-mux.mk references from BOOKWORM to TRIXIE Depends on: sonic-net/sonic-linkmgrd#330 (fixes SIGILL in unit tests caused by GCC 14 catching missing return UB) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
yxieca
force-pushed
the
feat/mux-trixie-upgrade
branch
from
63e31e8 to
8952aaf
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Submodule updates are handled by automated bots. Remove the manual submodule pin advance that was incorrectly included. Signed-off-by: Ying Xie <ying.xie@microsoft.com>
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Why I did it
Migrate the mux (linkmgrd) docker container from Debian bookworm to trixie, aligning it with other containers already on trixie.
The linkmgrd unit test SIGILL issue caused by GCC 14 catching a missing-return UB has been fixed in sonic-net/sonic-linkmgrd#330 (approved, CI passing).
Work item tracking
How I did it
dockers/docker-mux/Dockerfile.j2base image fromdocker-config-engine-bookwormtodocker-config-engine-trixierules/docker-mux.mkreferences from BOOKWORM to TRIXIE (DBG_DEPENDS, DBG_IMAGE_PACKAGES, LOAD_DOCKERS, SONIC_*_DOCKERS)How to verify it
INCLUDE_MUX=ydocker exec mux cat /etc/debian_versionshould show trixieWhich release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)