Skip to content

Commit 0e25f4a

Browse files
authored
Merge pull request #5734 from prckent/update_ci_dockerfiles
Update CI dockerfiles
2 parents 9fc4bdb + c673624 commit 0e25f4a

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

config/docker/dependencies/centos-stream/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Build stage with Spack pre-installed and ready to be used
22
FROM spack/centos-stream as builder
33

4-
54
# What we want to install and how we want to install it
65
# is specified in a manifest file (spack.yaml)
76

@@ -83,4 +82,3 @@ RUN ranlib /opt/view/lib/gcc/x86_64-pc-linux-gnu/11.3.0/libgcc.a
8382

8483
ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c", "$*", "--" ]
8584
CMD [ "/bin/bash" ]
86-

config/docker/dependencies/ubuntu22/clang-latest/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - &&\
3535
RUN apt-get update -y &&\
3636
apt-get install clang-16 clang-tools-16 libomp-16-dev -y
3737

38-
# must add a user different from root
39-
# to run MPI executables
38+
# must add a user different from root to run MPI executables
4039
RUN useradd -ms /bin/bash user
4140
# allow in sudoers to install packages
4241
RUN adduser user sudo

config/docker/dependencies/ubuntu22/openmpi/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/cl
6363
update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 100 && \
6464
update-alternatives --install /usr/bin/clang-tidy-diff.py clang-tidy-diff.py /usr/bin/clang-tidy-diff-14.py 100
6565

66-
# must add a user different from root
67-
# to run MPI executables
66+
# must add a user different from root to run MPI executables
6867
RUN useradd -ms /bin/bash user
6968
# allow in sudoers to install packages
7069
RUN adduser user sudo

config/docker/dependencies/ubuntu22/serial/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=noninteractive &&\
4141
apt-get install python3-numpy \
4242
python3-h5py \
4343
python3-pandas \
44+
python3-coverage \
45+
python3-pytest \
4446
python3-pip \
4547
-y
4648

0 commit comments

Comments
 (0)