Skip to content

[docker-ptf] Upgrade docker-ptf from bookworm to trixie #27889

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
yijingyan2 wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −16
Open

[docker-ptf] Upgrade docker-ptf from bookworm to trixie #27889

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f3dc2f
migrate docker-ptf to trixie
yijingyan2 Jun 14, 2026
d062ce2
Merge remote-tracking branch 'origin' into docker-ptf-trixie
yijingyan2 Jun 15, 2026
f078ad0
update PTF_MODIFIED value
yijingyan2 Jun 15, 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
19 changes: 10 additions & 9 deletions dockers/docker-ptf/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM {{ prefix }}multiarch/debian-debootstrap:arm64-stretch
{% elif PTF_ENV_PY_VER == "mixed" %}
FROM {{ prefix}}debian:buster
{% else %}
FROM {{ prefix }}debian:bookworm
FROM {{ prefix }}debian:trixie
{% endif %}

{% from "dockers/dockerfile-macros.j2" import install_python_wheels, copy_files, install_offending_packages %}
Expand Down Expand Up @@ -52,7 +52,7 @@ RUN apt-get update \
{% if PTF_ENV_PY_VER == "mixed" %}
libboost-atomic1.71.0 \
{% else %}
libboost-atomic1.81.0 \
libboost-atomic1.83.0 \
flex \
bison \
tcpd \
Expand Down Expand Up @@ -86,9 +86,9 @@ RUN apt-get update \
tacacs+ \
{% endif %}
rsyslog \
ntp \
ntpsec \
ntpstat \
ntpdate \
ntpsec-ntpdate \
arping \
bridge-utils \
libteam-utils \
Expand Down Expand Up @@ -367,7 +367,7 @@ RUN set -e; \
RUN pip3 install "setuptools>=70.0.0" "lxml>=5.3.2"

## Adjust sshd settings
RUN mkdir /var/run/sshd \
RUN mkdir -p /var/run/sshd \
&& echo 'root:root' | chpasswd \
&& sed -ri '/^#?PermitRootLogin/c\PermitRootLogin yes' /etc/ssh/sshd_config \
&& sed -ri '/^#?UsePAM/c\UsePAM no' /etc/ssh/sshd_config \
Expand Down Expand Up @@ -434,7 +434,7 @@ ENV PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

{% if PTF_ENV_PY_VER == "py3" %}
# Install the python-saithrift into the virtual environment
RUN echo "/usr/lib/python3/dist-packages/saithrift-0.9-py3.11.egg" >> /root/env-python3/lib/python3.11/site-packages/easy-install.pth
RUN echo "/usr/lib/python3/dist-packages/saithrift-0.9-py3.13.egg" >> /root/env-python3/lib/python3.13/site-packages/easy-install.pth
{% endif %}
Comment on lines 435 to 438
Comment on lines 435 to 438

# {% if PTF_ENV_PY_VER == "py3" %}
Expand Down Expand Up @@ -464,10 +464,11 @@ RUN set -eux; \
ln -sf "$f" "/usr/local/bin/$base"; \
done

RUN echo "/root/env-python3/lib/python3.11/site-packages" > /usr/lib/python3/dist-packages/virtualenv.pth; \
echo "/root/env-python3/lib/python3.11/site-packages" > /usr/lib/python3.11/dist-packages/virtualenv.pth
RUN mkdir -p /usr/lib/python3.13/dist-packages; \
echo "/root/env-python3/lib/python3.13/site-packages" > /usr/lib/python3/dist-packages/virtualenv.pth; \
echo "/root/env-python3/lib/python3.13/site-packages" > /usr/lib/python3.13/dist-packages/virtualenv.pth

RUN echo "PYTHONPATH=/root/env-python3/lib/python3.11/site-packages" >> /etc/environment
RUN echo "PYTHONPATH=/root/env-python3/lib/python3.13/site-packages" >> /etc/environment
Comment on lines +467 to +471
Comment on lines +467 to +471
Comment on lines +467 to +471

# Final system-level security upgrade: ensure every Debian package is at its
# latest patched version. This must run AFTER all apt-get install / dpkg -i
Expand Down
2 changes: 1 addition & 1 deletion platform/vs/docker-ptf.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ else
$(DOCKER_PTF)_DEPENDS += $(PYTHON_SAITHRIFT) $(P4LANG_PI) $(P4LANG_BMV2) $(P4LANG_P4C)
endif
SONIC_DOCKER_IMAGES += $(DOCKER_PTF)
SONIC_BOOKWORM_DOCKERS += $(DOCKER_PTF)
SONIC_TRIXIE_DOCKERS += $(DOCKER_PTF)
Comment on lines 12 to +13
endif
Loading