Skip to content

Commit

Permalink
Correctly install gfortran in clang setup
Browse files Browse the repository at this point in the history
  • Loading branch information
jbigot committed Jul 9, 2024
1 parent e960038 commit 1361930
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions spack/7-finalize/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ COPY --from=builder ${SPACK_ROOT}/var/spack/environments/pdienv/loads /etc/pdien
COPY --from=builder /etc/pdienv.env.sh /etc/pdienv.env.sh


ARG COMPILER

# use system gfortran for clang that doesn't support fortran
RUN set -ex \
; if grep -q clang compiler.lst \
; if echo "$COMPILER" | grep -q clang \
; then \
apt-get update -y \
&& apt-get upgrade -y \
Expand Down Expand Up @@ -107,13 +109,7 @@ ENV HOME /root

RUN set -ex \
&& apt-get purge -y curl \
&& apt-get autoremove -y \
&& apt-get clean -y \
&& apt-get autoclean -y \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /run/nologin \
&& rm -rf /root/* \
&& [ -f ~/.profile ] && ( sed -i 's/mesg n/( tty -s \&\& mesg n || true )/g' ~/.profile || true )
&& apt-get autoremove -y

USER ci:ci
WORKDIR /home/ci
Expand Down

0 comments on commit 1361930

Please sign in to comment.