Commit ff4e975b authored by David Moxey's avatar David Moxey

Try to remove UCX from build image on bullseye

parent e617319c
Pipeline #2375 passed with stages
in 166 minutes and 8 seconds
......@@ -111,6 +111,7 @@ stages:
stage: build-env-default
variables:
OS_DISTRO: debian
REMOVE_UCX: 0
script:
- OS_VERSION=$(echo $CI_JOB_NAME | cut -d- -f 1)
- BUILD_TYPE=$(echo $CI_JOB_NAME | cut -d- -f 2)
......@@ -118,7 +119,7 @@ stages:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- export IMAGE=$CI_REGISTRY_IMAGE:env-${OS_VERSION}-${BUILD_TYPE}
- docker pull $IMAGE || true
- docker build --pull -t $IMAGE .
- docker build --pull --build-arg REMOVE_UCX=${REMOVE_UCX} -t $IMAGE .
- docker push $IMAGE
.build-env-debian-template-full: &build-env-debian-template-full
......@@ -130,6 +131,9 @@ bullseye-default-build-env:
bullseye-full_py3-build-env:
<<: *build-env-debian-template-full
variables:
OS_DISTRO: debian
REMOVE_UCX: 1
needs: ["bullseye-default-build-env"]
buster-default-build-env:
......
FROM %%REGISTRY%%:env-%%OS_VERSION%%-default
ARG REMOVE_UCX
LABEL maintainer="Nektar++ Development Team <nektar-users@imperial.ac.uk>"
......@@ -10,5 +11,6 @@ RUN echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION} non-free" > \
apt-get update && \
apt-get install -y $(cat packages.txt) \
&& rm -rf /var/lib/apt/lists/*
RUN if [ "$REMOVE_UCX" = "1" ]; then rm -f /usr/lib/x86_64-linux-gnu/openmpi/lib/*ucx* && rm /usr/lib/x86_64-linux-gnu/openmpi/lib/openmpi3/*ucx*; fi
USER nektar:nektar
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment