Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions resources/docker_files/arm-compilers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ RUN apt-get update -q && apt-get install -yq \
python3-pip \
# to install several Python packages (done by individual jobs)
python3-venv \
# make `python` invoke `python3`
python-is-python3 \
# to download things installed from other places
wget \
&& rm -rf /var/lib/apt/lists/
Expand Down
3 changes: 3 additions & 0 deletions resources/docker_files/ubuntu-16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,9 @@ RUN wget -q https://github.com/lvc/abi-compliance-checker/archive/2.3.tar.gz &&
RUN git clone --branch 1.1 https://github.com/lvc/abi-dumper.git && \
cd abi-dumper && make install prefix=/usr && cd .. && rm -rf abi-dumper

# Make python point to python3
RUN ln -sf /usr/local/bin/python3 /usr/local/bin/python

# Add user
RUN useradd -m user

Expand Down
3 changes: 3 additions & 0 deletions resources/docker_files/ubuntu-18.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,9 @@ RUN python3 -m pip install 'pip<22' --upgrade | cat && \
python3 -m pip install setuptools --upgrade && \
true

# Make python point to python3
RUN ln -sf /usr/bin/python3 /usr/local/bin/python

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also needed on 16.04 (but we want /usr/local/bin/python3 there, not /usr/bin/python3 which is too old).


# Add user
RUN useradd -m user

Expand Down
2 changes: 2 additions & 0 deletions resources/docker_files/ubuntu-24.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ RUN apt-get update -q && apt-get install -yq \
python3-setuptools \
# to install several Python packages (done by individual jobs)
python3-venv \
# make `python` invoke `python3`
python-is-python3 \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In our script files we use python e.g link and python3 e.g. link interchangeably.

Historically, we used python3, not python, because during the python2→python3 transition, python was often python2. I don't know if that's still relevant in 2026, however. Ubuntu 20.04 was the last Ubuntu LTS where /usr/bin/python being Python 2 was officially supported. What about other OSes? What's /usr/bin/python on macOS these days?

Even if it's ok to no longer care about Python 2, I don't think we should use python3 and python interchangeably. That just makes things harder. Even if Python 2 is not available, python and python3 could be different versions of Python 3.x on some systems.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix for make_generates_files.py: Mbed-TLS/mbedtls-framework#270

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also needed on arm-compilers.

# provides some useful scripts for adding and removing repositories
software-properties-common \
# for test_driver.py (since TF-PSA-Crypto 1.1)
Expand Down