Merge Dockerfiles into a single multi-stage file

Author: ChrisLovering

.github/workflows/build-root.yml

@@ -68,7 +68,8 @@ jobs:
         uses: docker/build-push-action@v7
         with:
           context: .
-          file: ./Dockerfile.base
+          file: ./Dockerfile
+          target: builder-base
           platforms: linux/amd64,linux/arm64
           push: ${{ github.ref == 'refs/heads/main' }}
           cache-to: type=inline

.github/workflows/build-version.yml

@@ -47,6 +47,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          target: python-builder
           platforms: linux/amd64,linux/arm64
           push: ${{ github.ref == 'refs/heads/main' }}
           cache-to: type=inline

Dockerfile

@@ -1,6 +1,33 @@
-FROM ghcr.io/python-discord/python-builds:builder-base AS python-builder
+FROM buildpack-deps:bookworm AS builder-base
 LABEL org.opencontainers.image.authors="Joe Banks <joe@owlcorp.uk>, Chris Lovering <cj@owlcorp.uk>"
 
+ARG PYENV_VERSION="v2.6.11"
+
+RUN apt-get -y update \
+    && apt-get install -y --no-install-recommends \
+        libxmlsec1-dev \
+        tk-dev \
+        lsb-release \
+        software-properties-common \
+        gnupg \
+    && rm -rf /var/lib/apt/lists/*
+
+# Following guidance from https://github.com/python/cpython/blob/main/Tools/jit/README.md
+RUN curl -o /tmp/llvm.sh https://apt.llvm.org/llvm.sh \
+    && chmod +x /tmp/llvm.sh \
+    && /tmp/llvm.sh 19 \
+    && rm /tmp/llvm.sh
+
+ENV PYENV_ROOT=/pyenv \
+    PYTHON_CONFIGURE_OPTS='--disable-test-modules --enable-optimizations \
+        --with-lto --without-ensurepip'
+
+RUN git clone -b ${PYENV_VERSION} --depth 1 https://github.com/pyenv/pyenv.git $PYENV_ROOT
+
+COPY --link scripts scripts
+
+FROM builder-base AS python-builder
+
 ARG PYTHON_VERSION
 
 RUN [ -z "$PYTHON_VERSION" ] && echo "PYTHON_VERSION Docker build arg is required" && exit 1 || true