Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202511_azd #2743

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
mssonicbld wants to merge 2 commits into
base: 202511_azd
Choose a base branch
from
+2 −2
Open

[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202511_azd #2743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d2cb52
[docker-dash-engine]: Make supervisord-dependent-startup install base…
mssonicbld Jul 22, 2026
e37e9e7
Merge branch '202511' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Jul 23, 2026
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 platform/vs/docker-dash-engine/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN sed -i 's|http://.*.ubuntu.com|http://azure.archive.ubuntu.com|g' /etc/apt/s
RUN apt-get update

RUN apt-get install -f -y net-tools supervisor rsyslog python3-pip
RUN pip3 install supervisord-dependent-startup
RUN pip3 install --break-system-packages supervisord-dependent-startup || pip3 install supervisord-dependent-startup

COPY ["start.sh", "/usr/bin/"]

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker_version_control.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ tag=`echo $image_tag | cut -f2 -d:`

if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,docker,* ]]; then
# if docker image not in white list, exit
if [[ "$image_tag" != */debian:* ]] && [[ "$image_tag" != debian:* ]] && [[ "$image_tag" != multiarch/debian-debootstrap:* ]];then
if [[ "$image_tag" != */debian:* ]] && [[ "$image_tag" != debian:* ]] && [[ "$image_tag" != multiarch/debian-debootstrap:* ]] && [[ "$image_tag" != *p4lang/behavioral-model:* ]];then
exit 0
fi
if [ -f $version_file ];then
Expand Down
Loading