From b9e48ffa9cc7b72491bd7a2900dd92cb25bab443 Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Wed, 8 May 2024 10:54:09 +0200
Subject: [PATCH] Always install python3.x-minimal

---
 .github/workflows/build.yml | 5 ++++-
 runtime/Dockerfile          | 1 +
 vanilla/Dockerfile          | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1688232..b77ef00 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -125,7 +125,7 @@ jobs:
             BASE_IMAGE=${{ env.REGISTRY }}/${{ github.repository }}/base
             BASE_TAG=${{ github.event_name != 'pull_request' && github.sha || 'master' }}
             PYTHON_MINOR_VERSION=${{ matrix.python_minor_version }}
-            PYTHON_DISTUTILS=${{ (matrix.python_minor_version < 12 && '-distutils') || '-minimal' }}
+            PYTHON_DISTUTILS=${{ (matrix.python_minor_version < 12 && '-distutils') || '' }}
           cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ github.repository }}/${{ matrix.image }}:${{ (startsWith(matrix.image, 'runtime') && format('3.{0}-', matrix.python_minor_version)) || '' }}buildcache
           cache-to: ${{ github.event_name != 'pull_request' && env.CACHE_TO_STRING || '' }}
           provenance: false
@@ -185,3 +185,6 @@ jobs:
           cache-from: type=registry,ref=ref=${{ env.REGISTRY }}/${{ github.repository }}/${{ matrix.image }}:${{ format('3.{0}-', matrix.python_minor_version) }}buildcache
           cache-to: ${{ github.event_name != 'pull_request' && env.CACHE_TO_STRING || '' }}
           provenance: false
+
+      - name: Smoketest
+        run: docker run --rm ${{ env.REGISTRY }}/${{ github.repository }}/${{ matrix.image }}:${{ format('3.{0}-', matrix.python_minor_version) }}${{ github.sha }} bash -c 'python -c "print(1)" && pip install ipdb'
diff --git a/runtime/Dockerfile b/runtime/Dockerfile
index e6d29e5..bdfd88d 100644
--- a/runtime/Dockerfile
+++ b/runtime/Dockerfile
@@ -7,4 +7,5 @@ ARG PYTHON_MINOR_VERSION
 ARG PYTHON_DISTUTILS
 RUN apt-install \
         python3.${PYTHON_MINOR_VERSION}${PYTHON_DISTUTILS} \
+        python3.${PYTHON_MINOR_VERSION}-minimal \
         libpython3.${PYTHON_MINOR_VERSION}-stdlib
diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile
index d08549a..fac0373 100644
--- a/vanilla/Dockerfile
+++ b/vanilla/Dockerfile
@@ -12,5 +12,3 @@ RUN python3.${PYTHON_MINOR_VERSION} -m venv ${VIRTUAL_ENV} && \
 FROM ghcr.io/ddelange/pycuda/runtime:3.${PYTHON_MINOR_VERSION}-master
 
 COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
-
-RUN python -c "print('hello world')" && pip install ipdb