Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Nektar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
87
Issues
87
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
44
Merge Requests
44
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nektar
Nektar
Commits
ff4e975b
Commit
ff4e975b
authored
Oct 23, 2020
by
David Moxey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to remove UCX from build image on bullseye
parent
e617319c
Pipeline
#2375
passed with stages
in 166 minutes and 8 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
.gitlab-ci.yml
.gitlab-ci.yml
+5
-1
docker/nektar-env/Dockerfile_debian_full_py3
docker/nektar-env/Dockerfile_debian_full_py3
+2
-0
No files found.
.gitlab-ci.yml
View file @
ff4e975b
...
...
@@ -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
:
...
...
docker/nektar-env/Dockerfile_debian_full_py3
View file @
ff4e975b
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment