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.
richardlau · Oct 9, 2024 · dcc76f5 · dcc76f5
1 parent 639b70e
commit dcc76f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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