diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile | 8 | ||||
| -rwxr-xr-x | ci/docker/exherbo/paludis-exherbo-gcc/build.sh | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile b/ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile index 52664371b..6492ec6b7 100644 --- a/ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile +++ b/ci/docker/exherbo/paludis-exherbo-gcc/Dockerfile @@ -5,13 +5,17 @@ MAINTAINER Marvin Schmidt <marv@exherbo.org> ARG DEPENDENCY_VERSIONS ENV DEPENDENCY_VERSIONS ${DEPENDENCY_VERSIONS:-stable} +ARG PYTHON_ABI +ENV PYTHON_ABI ${PYTHON_ABI} + # Switch to option.conf.d layout RUN rm /etc/paludis/options.conf \ && mkdir /etc/paludis/options.conf.d COPY ./config/options/* /etc/paludis/options.conf.d/ COPY ./config/sets/paludis-deps.conf /etc/paludis/sets/ -RUN echo "*/* ${DEPENDENCY_VERSIONS}" >> /etc/paludis/package_unmask.conf +RUN echo "*/* ${DEPENDENCY_VERSIONS}" >> /etc/paludis/package_unmask.conf \ + && echo "*/* PYTHON_ABIS: -* ${PYTHON_ABI}" >> /etc/paludis/options.conf.d/python-abis.conf RUN chgrp tty /dev/tty \ && eclectic env update \ @@ -20,7 +24,7 @@ RUN chgrp tty /dev/tty \ && cave resolve \ --execute \ --preserve-world \ - --lazy \ + --complete \ --keep-targets if-same \ --keep if-same \ --permit-old-version "*/*" \ diff --git a/ci/docker/exherbo/paludis-exherbo-gcc/build.sh b/ci/docker/exherbo/paludis-exherbo-gcc/build.sh index 4ade37229..8aa8c922e 100755 --- a/ci/docker/exherbo/paludis-exherbo-gcc/build.sh +++ b/ci/docker/exherbo/paludis-exherbo-gcc/build.sh @@ -5,10 +5,13 @@ # next = all testing versions unmasked IMAGE_VERSION=${1:-latest} +PYTHON_ABI=3.7 + if [[ ${IMAGE_VERSION} == "latest" ]]; then DEPENDENCY_VERSIONS="stable" elif [[ ${IMAGE_VERSION} == "next" ]]; then DEPENDENCY_VERSIONS="testing broken" + PYTHON_ABI=3.8 else echo "Unknown image version, use 'latest' or 'next'" exit 1 @@ -19,5 +22,6 @@ docker build \ --rm \ --pull \ --build-arg DEPENDENCY_VERSIONS="${DEPENDENCY_VERSIONS}" \ + --build-arg PYTHON_ABI="${PYTHON_ABI}" \ --tag paludis/exherbo-gcc:${IMAGE_VERSION} \ . |