Skip to content

Upgrade eventd docker container from bookworm to trixie #26546

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
+6 −6
Open

Upgrade eventd docker container from bookworm to trixie #26546

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-eventd/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-eventd.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ DOCKER_EVENTD_DBG = $(DOCKER_EVENTD_STEM)-$(DBG_IMAGE_MARK).gz

$(DOCKER_EVENTD)_DEPENDS += $(SONIC_EVENTD)

$(DOCKER_EVENTD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)
$(DOCKER_EVENTD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_TRIXIE)_DBG_DEPENDS)
$(DOCKER_EVENTD)_DBG_DEPENDS += $(SONIC_EVENTD_DBG) $(LIBSWSSCOMMON_DBG)

$(DOCKER_EVENTD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE_PACKAGES)
$(DOCKER_EVENTD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_TRIXIE)_DBG_IMAGE_PACKAGES)

$(DOCKER_EVENTD)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BOOKWORM)
$(DOCKER_EVENTD)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_TRIXIE)

$(DOCKER_EVENTD)_PATH = $(DOCKERS_PATH)/$(DOCKER_EVENTD_STEM)

Expand All @@ -36,5 +36,5 @@ $(DOCKER_EVENTD)_RUN_OPT += -t
$(DOCKER_EVENTD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_EVENTD)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro

SONIC_BOOKWORM_DOCKERS += $(DOCKER_EVENTD)
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_EVENTD_DBG)
SONIC_TRIXIE_DOCKERS += $(DOCKER_EVENTD)
SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_EVENTD_DBG)
Comment on lines +39 to +40
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.

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.

Copilot uses AI. Check for mistakes.
Loading