From ae9544197669be693b9326f4c1cf952d33618fe2 Mon Sep 17 00:00:00 2001 From: Minos Galanakis Date: Fri, 9 Jan 2026 15:43:17 +0000 Subject: [PATCH 1/2] Dockerfiles: Make python always execute python3 Signed-off-by: Minos Galanakis --- resources/docker_files/ubuntu-18.04/Dockerfile | 3 +++ resources/docker_files/ubuntu-24.04/Dockerfile | 2 ++ 2 files changed, 5 insertions(+) diff --git a/resources/docker_files/ubuntu-18.04/Dockerfile b/resources/docker_files/ubuntu-18.04/Dockerfile index 7232e4567..f79bc909a 100644 --- a/resources/docker_files/ubuntu-18.04/Dockerfile +++ b/resources/docker_files/ubuntu-18.04/Dockerfile @@ -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 + # Add user RUN useradd -m user diff --git a/resources/docker_files/ubuntu-24.04/Dockerfile b/resources/docker_files/ubuntu-24.04/Dockerfile index 3d112fa59..fe2576f66 100644 --- a/resources/docker_files/ubuntu-24.04/Dockerfile +++ b/resources/docker_files/ubuntu-24.04/Dockerfile @@ -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 \ # provides some useful scripts for adding and removing repositories software-properties-common \ # for test_driver.py (since TF-PSA-Crypto 1.1) From b4153a9ba30a78636ade22b97ba4209a7f33b647 Mon Sep 17 00:00:00 2001 From: Minos Galanakis Date: Tue, 13 Jan 2026 15:05:55 +0000 Subject: [PATCH 2/2] arm-compiler/16.04 Dockerfiles: Make python always execute python3 Signed-off-by: Minos Galanakis --- resources/docker_files/arm-compilers/Dockerfile | 2 ++ resources/docker_files/ubuntu-16.04/Dockerfile | 3 +++ 2 files changed, 5 insertions(+) diff --git a/resources/docker_files/arm-compilers/Dockerfile b/resources/docker_files/arm-compilers/Dockerfile index 53fb205ae..fc960c687 100644 --- a/resources/docker_files/arm-compilers/Dockerfile +++ b/resources/docker_files/arm-compilers/Dockerfile @@ -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/ diff --git a/resources/docker_files/ubuntu-16.04/Dockerfile b/resources/docker_files/ubuntu-16.04/Dockerfile index 637a118ca..53f43e118 100644 --- a/resources/docker_files/ubuntu-16.04/Dockerfile +++ b/resources/docker_files/ubuntu-16.04/Dockerfile @@ -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