Draft
Conversation
xincunli-sonic
requested review from
lguohan,
qiluo-msft and
xumia
as code owners
Collaborator
|
/azp run Azure.sonic-buildimage |
Signed-off-by: Xincun Li <stli@microsoft.com>
|
Azure Pipelines successfully started running 1 pipeline(s). |
xincunli-sonic
force-pushed
the
xincun/gcu-container
branch
from
90f7182 to
59172f0
Compare
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…and duplicate PACKAGE_NAME - rules/docker-gcu.mk: replace _DEPENDS/_INSTALLS/_WHLS with _PYTHON_WHEELS so slave.mk correctly exports the docker_gcu_whls Jinja2 variable - dockers/docker-gcu/Dockerfile.j2: fix docker_sonic_gcu_whls -> docker_gcu_whls (variable name is derived from container stem 'docker-gcu', not 'docker-sonic-gcu') - src/gcu-watchdog/Cargo.toml: remove empty [lib] section that caused Cargo to look for src/lib.rs which does not exist - rules/docker-gcu-watchdog.mk: remove duplicate _PACKAGE_NAME = gcu_watchdog (underscore form on line 21 was overridden by the hyphen form below) Signed-off-by: Xincun Li <stli@microsoft.com>
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Two bugs caused 'COPY watchdog/ ./' to fail at docker build time: 1. Symlink vs real directory: Docker's COPY does not follow symlinks that point to absolute paths outside the build context root. The previous 'ln -sfn ...' created such a symlink, so Docker reported '/watchdog: not found'. Changed to 'cp -a' to place a real copy of the Rust source inside the build context. 2. Wrong Make target name: the prerequisite rule was attached to the bare target 'docker-gcu-watchdog.gz', but slave.mk's actual Docker image target is 'target/docker-gcu-watchdog.gz'. These are distinct Make targets, so the copy rule never fired. Changed to use \/\ which resolves to the correct prefixed path. Also add dockers/docker-gcu-watchdog/.gitignore to exclude the generated watchdog/ copy from git tracking. Signed-off-by: Xincun Li <stli@microsoft.com>
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why I did it
Introduce a dedicated
docker-gcucontainer that provisions GCU in an isolatedPython venv (
/opt/gcu-venv) using--system-site-packagesto reuse system C-extensions(swsscommon, sonic-py-common) while keeping GCU and its Python deps independently
versioned and deployable without a full SONiC image rebuild.
Work item tracking
How I did it
dockers/docker-gcu/with Dockerfile.j2, supervisord.conf, docker-init.shrules/docker-gcu.mkgated on INCLUDE_GCU=yHow to verify it
make target/docker-gcu.gzsupervisorctl status gcu-setupshows EXITED (0)supervisorctl status gcu-healthcheckshows EXITED (0)/opt/gcu-venv/bin/config apply-patchworks with an empty patchWhich release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)