Fix installation python

Author: chudyandrej

python/base/Dockerfile.base

@@ -3,24 +3,24 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # Install OS dependencies
 RUN apt-get update && apt-get -yq dist-upgrade \
-&& apt-get install -yq --no-install-recommends \
-build-essential \
-bzip2 \
-cmake \
-curl \
-git \
-graphviz \
-libgtk2.0-dev \
-locales \
-sudo \
-unzip \
-vim \
-wget \
-ssh \
-gnupg2 \
-ca-certificates \
-&& apt-get clean \
-&& rm -rf /var/lib/apt/lists/*
+  && apt-get install -yq --no-install-recommends \
+  build-essential \
+  bzip2 \
+  cmake \
+  curl \
+  git \
+  graphviz \
+  libgtk2.0-dev \
+  locales \
+  sudo \
+  unzip \
+  vim \
+  wget \
+  ssh \
+  gnupg2 \
+  ca-certificates \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 ENV SHELL=/bin/bash \
   LC_ALL=en_US.UTF-8 \

python/python/Dockerfile.python

@@ -1,50 +1,33 @@
 ARG CIRCLE_PULL_REQUEST
-FROM debian:bullseye-20241111-slim AS builder
+FROM deepnote/python:base${CIRCLE_PULL_REQUEST:+-ra-${CIRCLE_PULL_REQUEST##*/}}
 
 # Install dependencies for building Python
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    wget \
-    cmake \
     build-essential \
-    libssl-dev \
     zlib1g-dev \
     libncurses5-dev \
-    libncursesw5-dev \
-    libreadline-dev \
-    libsqlite3-dev \
     libgdbm-dev \
-    libdb5.3-dev \
-    libbz2-dev \
-    libexpat1-dev \
-    liblzma-dev \
-    tk-dev \
+    libnss3-dev \
+    libssl-dev \
+    libreadline-dev \
     libffi-dev \
-    uuid-dev \
+    libsqlite3-dev \
     ca-certificates \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 # Download and extract the Python source code
-WORKDIR /tmp
-ARG PYTHON_VERSION_PATCH
-RUN wget -qO- "https://www.python.org/ftp/python/${PYTHON_VERSION_PATCH}/Python-${PYTHON_VERSION_PATCH}.tgz" | tar xvz \
-    && cd "/tmp/Python-${PYTHON_VERSION_PATCH}" \
-    && ./configure --enable-optimizations --with-ensurepip=install \
+ARG PYTHON_VERSION
+RUN cd "/tmp" \
+    && wget -qO- "https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz" | tar xvz \
+    && cd "/tmp/Python-${PYTHON_VERSION}" \
+    && ./configure --enable-optimizations --with-ensurepip=install  \
     && make -j "$(nproc)" \
     && make altinstall
 
-
-FROM deepnote/python:base${CIRCLE_PULL_REQUEST:+-ra-${CIRCLE_PULL_REQUEST##*/}}
-# Copy Python from the builder stage
-ARG PYTHON_VERSION
-# Layers will be different between python versions from here onwards because of the build-arg
-
-COPY --from=builder "/usr/local/bin/python${PYTHON_VERSION}" "/usr/local/bin/python${PYTHON_VERSION}"
-COPY --from=builder "/usr/local/bin/pip${PYTHON_VERSION}" "/usr/local/bin/pip${PYTHON_VERSION}"
-COPY --from=builder "/usr/local/lib/python${PYTHON_VERSION}" "/usr/local/lib/python${PYTHON_VERSION}"
-
-RUN update-alternatives --install /usr/bin/python python "/usr/local/bin/python${PYTHON_VERSION}" 1
-RUN update-alternatives --install /usr/bin/pip pip "/usr/local/bin/pip${PYTHON_VERSION}" 1
+RUN PYTHON_MAJOR_MINOR_VERSION="${PYTHON_VERSION%.*}" \
+    && ln -s /usr/local/bin/python${PYTHON_MAJOR_MINOR_VERSION} /usr/local/bin/python \
+    && ln -s /usr/local/bin/pip${PYTHON_MAJOR_MINOR_VERSION} /usr/local/bin/pip
 
 # We create the virtual environment in the home directory in the Dockerfile
 # for performance improvement.