Skip to content
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

Jump to bottom

[docker_image_ctl.j2]: swss docker initialization improvements #17628

Merged
merged 4 commits into from
Jan 4, 2024
Merged

[docker_image_ctl.j2]: swss docker initialization improvements #17628

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
260526c
[docker_image_ctl.j2]: swss docker initialization improvements
prabhataravind Dec 27, 2023
e20d2b7
Merge branch 'sonic-net:master' into paravind/swssconfig
prabhataravind Dec 28, 2023
6119571
Merge branch 'sonic-net:master' into paravind/swssconfig
prabhataravind Jan 2, 2024
b8585c5
[docker_image_ctl.j2]: Use swss$DEV to accommodate multi ASIC platfor…
prabhataravind Jan 2, 2024
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
9 changes: 9 additions & 0 deletions files/build_templates/docker_image_ctl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,12 @@ function postStartAction()
fi
chgrp -f redis $REDIS_SOCK && chmod -f 0760 $REDIS_SOCK
{%- elif docker_container_name == "swss" %}
# Wait until swss container state is Running
until [[ ($(docker inspect -f {{"'{{.State.Running}}'"}} swss$DEV) == "true") ]]; do
sleep 0.1
done
echo "swss container is up and running"

docker exec swss$DEV rm -f /ready # remove cruft
if [[ "$BOOT_TYPE" == "fast" ]] && [[ -d /host/fast-reboot ]]; then
test -e /host/fast-reboot/fdb.json && docker cp /host/fast-reboot/fdb.json swss$DEV:/
Expand All @@ -292,6 +298,9 @@ function postStartAction()
rm -fr /host/fast-reboot
fi
docker exec swss$DEV touch /ready # signal swssconfig.sh to go
# Re-confirm that file is indeed created and log an error if not
docker exec swss$DEV test -f /ready && echo "File swss:/ready created" || echo "Error: File swss:/ready doesn't exist"

{%- elif docker_container_name == "pmon" %}

DEVPATH="/usr/share/sonic/device"
Expand Down