From 950115b9236accf7cf3a8cc6b0e60d20364a62db Mon Sep 17 00:00:00 2001
From: jackyu <jackyu@yunify.com>
Date: Wed, 11 Dec 2024 10:24:08 +0800
Subject: [PATCH] upgrade python version to 3.10.12

---
 python/Dockerfile        | 22 +++-------------------
 python/podman/Dockerfile | 22 +++-------------------
 2 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/python/Dockerfile b/python/Dockerfile
index bbe20c1..a793a4a 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -1,22 +1,6 @@
-FROM kubespheredev/builder-base:v3.1.0
+FROM kubespheredev/builder-base:v4.1.0
 
-# python3
-ENV PYTHON_VERSION=3.7.11
-RUN yum -y install bzip2-devel libffi-devel libsqlite3x-devel && \
-    curl -fSL https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz -o /usr/src/Python-${PYTHON_VERSION}.tgz && \
-    tar xzf /usr/src/Python-${PYTHON_VERSION}.tgz -C /usr/src/ --no-same-owner && \
-    cd /usr/src/Python-${PYTHON_VERSION} && \
-    ./configure --enable-optimizations --with-ensurepip=install --enable-loadable-sqlite-extensions && \
-    make altinstall -j 2 && \
-    cd ../ && \
-    rm -rf /usr/src/Python-${PYTHON_VERSION}.tgz /usr/src/Python-${PYTHON_VERSION} && \
-    ln -fs /usr/local/bin/python3.7 /usr/bin/python && \
-    ln -fs /usr/local/bin/python3.7 /usr/bin/python3 && \
-    ln -fs /usr/local/bin/pip3.7 /usr/bin/pip && \
-    python3 -m pip install --upgrade pip && \
-    sed -e 's|^#!/usr/bin/python|#!/usr/bin/python2.7|g' -i.bak /usr/bin/yum && \
-    sed -e 's|^#! /usr/bin/python|#! /usr/bin/python2.7|g' -i.bak /usr/libexec/urlgrabber-ext-down && \
-    yum -y remove bzip2-devel libffi-devel libsqlite3x-devel && \
-    yum -y clean all
+# python:3.10.12 pip:22.0.2
+RUN apt-get install -y python3 pip && apt-get clean autoclean && ln -s /usr/bin/python3 /usr/bin/python
 
 CMD ["python","--version"]
diff --git a/python/podman/Dockerfile b/python/podman/Dockerfile
index 112bda2..93c8871 100644
--- a/python/podman/Dockerfile
+++ b/python/podman/Dockerfile
@@ -1,22 +1,6 @@
-FROM kubespheredev/builder-base:v3.1.0-podman
+FROM kubespheredev/builder-base:v4.1.0-podman
 
-# python3
-ENV PYTHON_VERSION=3.7.11
-RUN yum -y install bzip2-devel libffi-devel libsqlite3x-devel && \
-    curl -fSL https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz -o /usr/src/Python-${PYTHON_VERSION}.tgz && \
-    tar xzf /usr/src/Python-${PYTHON_VERSION}.tgz -C /usr/src/ --no-same-owner && \
-    cd /usr/src/Python-${PYTHON_VERSION} && \
-    ./configure --enable-optimizations --with-ensurepip=install --enable-loadable-sqlite-extensions && \
-    make altinstall -j 2 && \
-    cd ../ && \
-    rm -rf /usr/src/Python-${PYTHON_VERSION}.tgz /usr/src/Python-${PYTHON_VERSION} && \
-    ln -fs /usr/local/bin/python3.7 /usr/bin/python && \
-    ln -fs /usr/local/bin/python3.7 /usr/bin/python3 && \
-    ln -fs /usr/local/bin/pip3.7 /usr/bin/pip && \
-    python3 -m pip install --upgrade pip && \
-    sed -e 's|^#!/usr/bin/python|#!/usr/bin/python2.7|g' -i.bak /usr/bin/yum && \
-    sed -e 's|^#! /usr/bin/python|#! /usr/bin/python2.7|g' -i.bak /usr/libexec/urlgrabber-ext-down && \
-    yum -y remove bzip2-devel libffi-devel libsqlite3x-devel && \
-    yum -y clean all
+# python:3.10.12 pip:22.0.2
+RUN apt-get install -y python3 pip && apt-get clean autoclean && ln -s /usr/bin/python3 /usr/bin/python
 
 CMD ["python","--version"]