fix(python): further tidies

Author: Greelan

python/3/Dockerfile

@@ -1,4 +1,4 @@
-# Python image for AMP containers including Python 3.10, 3.11 and 3.12
+# Python image for AMP containers including Python 3.10, 3.11 (default) and 3.12
 # ghcr.io/cubecoders/amp:python-3
 
 FROM        python:3.10-slim-bookworm AS py310
@@ -15,25 +15,26 @@ ARG         DEBIAN_FRONTEND=noninteractive
 RUN         set -eux; \
             apt-get update; \
             apt-get install -y --no-install-recommends \
-                python3.11 python3.11-venv python3-pip; \
+                python3 python3-venv python3-pip; \
             apt-get clean; \
             rm -rf /var/lib/apt/lists/*
 
-# Drop in Python 3.10
-COPY        --from=py310 /usr/local/lib/ /usr/local/lib/
-COPY        --from=py310 /usr/local/bin/ /usr/local/bin/
+# Drop in upstream Python 3.10
+COPY        --from=py310 /usr/local/bin/python3.10 /usr/local/bin/
+COPY        --from=py310 /usr/local/bin/pip3.10 /usr/local/bin/
+COPY        --from=py310 /usr/local/lib/python3.10/ /usr/local/lib/python3.10/
+COPY        --from=py310 /usr/local/lib/libpython3.10* /usr/local/lib/
 
-# Drop in Python 3.12
-COPY        --from=py312 /usr/local/lib/ /usr/local/lib/
-COPY        --from=py312 /usr/local/bin/ /usr/local/bin/
+# Drop in upstream Python 3.12
+COPY        --from=py312 /usr/local/bin/python3.12 /usr/local/bin/
+COPY        --from=py312 /usr/local/bin/pip3.12 /usr/local/bin/
+COPY        --from=py312 /usr/local/lib/python3.12/ /usr/local/lib/python3.12/
+COPY        --from=py312 /usr/local/lib/libpython3.12* /usr/local/lib/
 
 # Clean up
 RUN         set -eux; \
             python3.10 -m pip --no-cache-dir install --upgrade pip setuptools wheel; \
             python3.12 -m pip --no-cache-dir install --upgrade pip setuptools wheel; \
             for shim in python3.10 python3.12 pip3.10 pip3.12; do \
                 ln -sf "/usr/local/bin/$shim" "/usr/bin/$shim"; \
-            done; \
-            for shim in pip pip3 idle3 pydoc3 2to3 python-config python3-config; do \
-                rm -f "/usr/local/bin/$shim"; \
             done