Revert "Always include -minimal"

This reverts commit 1e63588.
ddelange · May 8, 2024 · 341037f · 341037f
1 parent 1e63588
commit 341037f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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') || '' }}
+            PYTHON_DISTUTILS=${{ (matrix.python_minor_version < 12 && '-distutils') || '-minimal' }}
           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

diff --git a/runtime/Dockerfile b/runtime/Dockerfile
@@ -7,6 +7,4 @@ 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 && \
-    python -c "print('hello world')"
+        libpython3.${PYTHON_MINOR_VERSION}-stdlib
diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile
@@ -12,3 +12,5 @@ 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')"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ 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')"