docker: Single-stage nogil base + cleanup

Author: enwask

docker/Dockerfile.amd

@@ -10,6 +10,8 @@ ARG FROM_IMAGE=ubuntu:22.04
 FROM $FROM_IMAGE AS ubuntu-base
 FROM rocm/dev-ubuntu-22.04:${ROCM_VERSION}-complete AS sdk-base
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 COPY --from=ubuntu-base /opt /opt
 ENV PATH="/opt/python3/bin:${PATH}"
 
@@ -19,13 +21,13 @@ ARG OMPI_BRANCH="v5.0.x"
 # Update and Install basic Linux development tools
 RUN rm /etc/apt/sources.list.d/* \
   && apt-get update \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+  && apt-get install -y --no-install-recommends \
     dh-autoreconf git \
     ca-certificates ssh make libtinfo* initramfs-tools libelf-dev \
     wget build-essential autoconf automake libtool \
     pkg-config libnuma* gfortran flex hwloc cmake && \
   if [ ! -d "/opt/python3" ]; then \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    apt-get install -y --no-install-recommends \
       python3-venv python3-dev python3-pip; \
   else \
     echo "Using free-threaded Python build"; \

docker/Dockerfile.devito

@@ -16,18 +16,12 @@ ARG GROUP_ID=1000
 
 ENV PIP_USE_PEP517=1
 
-# If we are using a free-threaded base image, need to install libffi-dev again
-ARG base
-RUN case "$base" in *nogil) \
-        echo "Installing libffi-dev for free-threaded build"; \
-        apt-get update && apt-get install -y libffi-dev;; \
-    esac;
-
 # Install pip dependencies
 RUN python3 -m venv /venv && \
     /venv/bin/pip install --no-cache-dir --upgrade pip wheel setuptools
 # Jupyter cannot yet be installed with a free-threaded Python build
-# See https://github.com/jupyterlab/jupyterlab/issues/16915#
+# See https://github.com/jupyterlab/jupyterlab/issues/16915
+ARG base
 RUN case "$base" in *nogil) \
         echo "Skipping jupyter installation for free-threaded build";; \
     *) \

docker/Dockerfile.nogil

@@ -4,10 +4,9 @@
 
 ARG FROM_IMAGE=ubuntu:22.04
 
-# Builder stage: build Python 3.13 from source with the GIL disabled
 FROM $FROM_IMAGE AS builder
 
-ARG DEBIAN_FRONTEND=noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Install build dependencies for Python
 RUN apt-get update && apt-get install -y \
@@ -18,22 +17,17 @@ RUN apt-get update && apt-get install -y \
     zlib1g-dev
 
 # Clone CPython repository at the 3.13 branch
-RUN git clone --depth 1 --branch 3.13 https://github.com/python/cpython.git /usr/src/cpython
+RUN git clone --depth 1 --branch 3.13 https://github.com/python/cpython.git /tmp/cpython
 
-WORKDIR /usr/src/cpython
+WORKDIR /tmp/cpython
 
 # Configure, build, and install Python 3.13 with the GIL disabled
 RUN ./configure --prefix=/opt/python3 --disable-gil --enable-optimizations
 RUN make -j$(nproc)
 RUN make install
 
-# Base runtime stage
-FROM $FROM_IMAGE
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-# Copy Python build from the previous stage
-COPY --from=builder /opt/python3/ /opt/python3/
+# Clean up temp files
+RUN rm -rf /tmp/cpython
 
 # Set the PATH to include custom Python build
 ENV PATH="/opt/python3/bin:${PATH}"