diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3ecb76..1688232 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -124,7 +124,8 @@ jobs: build-args: | BASE_IMAGE=${{ env.REGISTRY }}/${{ github.repository }}/base BASE_TAG=${{ github.event_name != 'pull_request' && github.sha || 'master' }} - PYTHON_MINOR_VERSION=${{ matrix.python_minor_version }}${{ (matrix.python_minor_version < 12 && '-distutils') || '' }} + PYTHON_MINOR_VERSION=${{ matrix.python_minor_version }} + 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 index ecdd48b..e6d29e5 100644 --- a/runtime/Dockerfile +++ b/runtime/Dockerfile @@ -4,4 +4,7 @@ ARG BASE_TAG FROM ${BASE_IMAGE}:${BASE_TAG} ARG PYTHON_MINOR_VERSION -RUN apt-install python3.${PYTHON_MINOR_VERSION} +ARG PYTHON_DISTUTILS +RUN apt-install \ + python3.${PYTHON_MINOR_VERSION}${PYTHON_DISTUTILS} \ + libpython3.${PYTHON_MINOR_VERSION}-stdlib diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile index fac0373..d08549a 100644 --- 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')" && pip install ipdb