Upgrade eventd docker container from bookworm to trixie#26546
Upgrade eventd docker container from bookworm to trixie#26546yxieca wants to merge 1 commit intosonic-net:masterfrom
Conversation
Migrate the eventd 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-eventd.mk references from BOOKWORM to TRIXIE Signed-off-by: Ying Xie <ying.xie@microsoft.com>
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Pull request overview
This PR upgrades the docker-eventd container to Debian Trixie as part of SONiC’s ongoing Trixie migration, by switching its base image and build-rule dependencies from the Bookworm config-engine image to the Trixie config-engine image.
Changes:
- Update
docker-eventdbuild rules to depend on and loaddocker-config-engine-trixie(including debug deps/packages). - Switch
docker-eventdDockerfile base image fromdocker-config-engine-bookwormtodocker-config-engine-trixie. - Move
docker-eventdregistration from the Bookworm docker list to the Trixie docker list.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| rules/docker-eventd.mk | Migrates docker-eventd build dependencies/load base to the Trixie config-engine image and registers it as a Trixie docker. |
| dockers/docker-eventd/Dockerfile.j2 | Switches the container base image to docker-config-engine-trixie. |
| SONIC_TRIXIE_DOCKERS += $(DOCKER_EVENTD) | ||
| SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_EVENTD_DBG) |
There was a problem hiding this comment.
By moving docker-eventd to SONIC_TRIXIE_DOCKERS (and removing it from the bookworm docker list), a bookworm build that enables INCLUDE_SYSTEM_EVENTD (via SONIC_INCLUDE_SYSTEM_EVENTD=y) will still add docker-eventd into SONIC_INSTALL_DOCKER_IMAGES, causing installers to depend on target/docker-eventd.gz. Since DOCKER_IMAGES for BLDENV=bookworm comes from SONIC_BOOKWORM_DOCKERS, there will be no rule to build target/docker-eventd.gz and the build will fail. Consider gating docker-eventd’s inclusion in SONIC_INSTALL_DOCKER_IMAGES to trixie builds only, or providing a separate bookworm variant if bookworm+system-eventd is still supported.
Why I did it
Upgrade the eventd Docker container from Debian Bookworm to Debian Trixie as part of the ongoing SONiC Trixie migration effort tracked in sonic-net/SONiC#2169.
How I did it
docker-config-engine-bookwormtodocker-config-engine-trixieHow to verify it
make PLATFORM=vs target/sonic-vs.img.gzWhich release branch to backport
None — this is a master-only change for the Trixie migration.
Tested branch