From dcc76f5c8fba18d37bffb0538f8651586c9c1a3b Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Wed, 9 Oct 2024 14:59:27 +0100 Subject: [PATCH] ansible: update Python on ubi8/rhel8 containers Update the version of Python used in the UBI 8/RHEL 8 container images from Python 3.8 to 3.12. --- ansible/roles/docker/templates/rhel8.Dockerfile.j2 | 3 ++- ansible/roles/docker/templates/rhel8_arm_cross.Dockerfile.j2 | 4 +--- ansible/roles/docker/templates/ubi81.Dockerfile.j2 | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/roles/docker/templates/rhel8.Dockerfile.j2 b/ansible/roles/docker/templates/rhel8.Dockerfile.j2 index 9f56e2ae1..0b60e7d2f 100644 --- a/ansible/roles/docker/templates/rhel8.Dockerfile.j2 +++ b/ansible/roles/docker/templates/rhel8.Dockerfile.j2 @@ -23,7 +23,8 @@ RUN dnf install --disableplugin=subscription-manager -y \ git \ java-17-openjdk-headless \ make \ - python3.8 \ + python3.12 \ + python3.12-pip \ procps-ng \ xz \ && dnf --disableplugin=subscription-manager clean all diff --git a/ansible/roles/docker/templates/rhel8_arm_cross.Dockerfile.j2 b/ansible/roles/docker/templates/rhel8_arm_cross.Dockerfile.j2 index acd43229c..420cea07c 100644 --- a/ansible/roles/docker/templates/rhel8_arm_cross.Dockerfile.j2 +++ b/ansible/roles/docker/templates/rhel8_arm_cross.Dockerfile.j2 @@ -27,7 +27,7 @@ RUN dnf install --disableplugin=subscription-manager -y \ libstdc++-devel \ libstdc++-devel.i686 \ make \ - python3.8 \ + python3.12 \ procps-ng \ xz \ && dnf --disableplugin=subscription-manager clean all @@ -52,8 +52,6 @@ VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache ENV PYTHON /usr/bin/python3 -RUN pip3 install tap2junit=={{ tap2junit_version }} - RUN git clone --depth=1 https://github.com/rvagg/rpi-newer-crosstools.git /opt/raspberrypi/rpi-newer-crosstools COPY cc-selector.sh /opt/raspberrypi/cc-selector.sh diff --git a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 index 185172a02..d4e9f33d2 100644 --- a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 @@ -23,7 +23,8 @@ RUN dnf install --disableplugin=subscription-manager -y \ git \ java-17-openjdk-headless \ make \ - python3.8 \ + python3.12 \ + python3.12-pip \ openssl-devel \ procps-ng \ && dnf --disableplugin=subscription-manager clean all