Brcm containers migrate to trixie#25942
Conversation
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
2e297ad to
543311f
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
543311f to
cf5defd
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…i-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 <daweihuang@microsoft.com>
|
/azpw ms_conflict |
| DOCKER_SYNCD_PLATFORM_CODE = brcm | ||
| include $(PLATFORM_PATH)/../template/docker-syncd-bookworm.mk | ||
|
|
||
| include $(PLATFORM_PATH)/../template/docker-syncd-trixie.mk |
There was a problem hiding this comment.
Saiarcot,
This is platform common template file for trixie but not broadcom specific. Can you provide the template for trixie as you did for bookworm before ?
=> e15a1aa
Geans
There was a problem hiding this comment.
#25677 has a version for Trixie that could work. Please test that version and verify that it works.
Additionally, have you done a local build of the changes here?
There was a problem hiding this comment.
yes, I've done a local build and Loaded docker-syncd-brcm and performed library dependency check. Actually, I already had a template docker-syncd-trixie.mk created in my local as the one in PR#25677 but didn't push to PR since this is common file which is out of my PR scope.
Geans
There was a problem hiding this comment.
Could you please push that file as well?
|
/azpw ms_conflict |
…i-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 <daweihuang@microsoft.com>
cf5defd to
375458f
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
375458f to
5e4a5b5
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@saiarcot895 Can you help to approve the review for merging ? |
…i-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 <daweihuang@microsoft.com>
Why I did it
Upgrade BRCM-related containers (PDE and SYNCD) to support Debian Trixie (Debian 13).
Work item tracking
Microsoft ADO (number only): [N/A]
How I did it
Container Base Image Update: Updated Dockerfile.j2 for both docker-pde and docker-syncd-brcm
to reference the Trixie base engine.
Python Environment Fix:
Added --break-system-packages to pip3 install commands to comply with PEP 668 in Debian Trixie. This allows overriding system-installed packages (like jsonschema) with required versions from Python wheels.
Added --no-install-recommends to apt-get install to prevent unnecessary systemd/udev bloat and potential conflicts during the build process.
Dependency Alignment: Ensured all Debian package dependencies and Python wheels are correctly resolved within the Trixie environment.
How to verify it
Validated the generated images on a Trixie build
Build Success: Successfully generated target/docker-pde.gz and target/docker-syncd-brcm.gz.
PDE Validation:
Loaded docker-pde and verified jsonschema version.
Command: docker run --rm --entrypoint /bin/bash docker-pde -c "pip3 show jsonschema"
Result: Version 2.6.0 (Correctly overrode the system's 4.19.2).
SYNCD-BRCM Validation:
Loaded docker-syncd-brcm and performed library dependency check.
Command: docker run --rm --entrypoint /bin/bash docker-syncd-brcm -c "ldd /usr/bin/syncd"
Result: All shared libraries (including libsai.so.1 and Trixie-specific glibc/boost) are fully resolved with no "not found" errors.