Skip to content

[docker-ptf] create symlinks for py3-only image #19813

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

Merged
wangxin merged 6 commits into from
Aug 23, 2024
Merged

[docker-ptf] create symlinks for py3-only image #19813

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8188990
Build autoconf from source
opcoder0 Aug 1, 2024
97c0c9b
Merge branch 'master' into docker-ptf/create-ptf-symlink-in-bin
opcoder0 Aug 5, 2024
d3faec8
[docker-ptf] symlink ptf binary for py3 only config
opcoder0 Aug 5, 2024
6c8101a
create /root/env-python3 symlink
opcoder0 Aug 5, 2024
fa44ead
Merge multiple commands into one RUN for better Docker layering
opcoder0 Aug 16, 2024
b93a92c
Merge branch 'master' into docker-ptf/create-ptf-symlink-in-bin
opcoder0 Aug 16, 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
13 changes: 13 additions & 0 deletions dockers/docker-ptf/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ LABEL maintainer="Pavel Shirshov"

COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
COPY ["apt-retries-count", "/etc/apt/apt.conf.d"]

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -266,6 +267,18 @@ RUN dpkg -i \
debs/{{ deb }}{{' '}}
{%- endfor %}

{% if PTF_ENV_PY_VER == "py3" %}
# Create symlink so that test scripts and ptf_runner invocation path
# is same across python 2 and python 3 envs. Note that for virtual-env
# ptf is under /root/env-python3/bin.
# TODO - cleanup when the supported PTF image is py3only across all branches
RUN mkdir -p /root/env-python3/bin \
&& ln -s /usr/local/bin/ptf /usr/bin/ptf \
&& ln -s /usr/bin/python /root/env-python3/bin/python3 \
&& ln -s /usr/bin/python /root/env-python3/bin/python \
&& ln -s /usr/local/bin/ptf /root/env-python3/bin/ptf
{% endif %}

COPY ["*.ini", "/etc/ptf/"]
EXPOSE 22 8009

Expand Down