Skip to content

Upgrade mux docker container from bookworm to trixie #26543

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

Open
yxieca wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade mux docker container from bookworm to trixie #26543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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-mux/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
10 changes: 5 additions & 5 deletions rules/docker-mux.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ DOCKER_MUX_DBG = $(DOCKER_MUX_STEM)-$(DBG_IMAGE_MARK).gz
$(DOCKER_MUX)_PATH = $(DOCKERS_PATH)/$(DOCKER_MUX_STEM)

$(DOCKER_MUX)_DEPENDS = $(SONIC_LINKMGRD) $(LIBSWSSCOMMON)
$(DOCKER_MUX)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)
$(DOCKER_MUX)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_TRIXIE)_DBG_DEPENDS)
$(DOCKER_MUX)_DBG_DEPENDS += $(SONIC_LINKMGRD_DBG) $(LIBSWSSCOMMON_DBG)

$(DOCKER_MUX)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE_PACKAGES)
$(DOCKER_MUX)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_TRIXIE)_DBG_IMAGE_PACKAGES)

$(DOCKER_MUX)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BOOKWORM)
$(DOCKER_MUX)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_TRIXIE)

$(DOCKER_MUX)_VERSION = 1.0.0
$(DOCKER_MUX)_PACKAGE_NAME = mux
Expand All @@ -29,8 +29,8 @@ SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_MUX_DBG)
endif

Copy link

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

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

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.

Suggested change
SONIC_BOOKWORM_DOCKERS += $(DOCKER_MUX)
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_MUX_DBG)

Copilot uses AI. Check for mistakes.
SONIC_BOOKWORM_DOCKERS += $(DOCKER_MUX)
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_MUX_DBG)
SONIC_TRIXIE_DOCKERS += $(DOCKER_MUX)
SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_MUX_DBG)

$(DOCKER_MUX)_CONTAINER_NAME = mux
$(DOCKER_MUX)_RUN_OPT += -t
Expand Down
Loading