Reinstall gfotran after each squash

pdidev · Jul 9, 2024 · d16a8e6 · d16a8e6
1 parent 616cda1
commit d16a8e6
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 0 deletions.
diff --git a/spack/3c-squash/Dockerfile b/spack/3c-squash/Dockerfile
@@ -16,6 +16,21 @@ COPY --from=builder ${SPACK_ROOT} ${SPACK_ROOT}
 COPY --from=builder ${SPACK_INSTALL} ${SPACK_INSTALL}
 
 
+# use system gfortran for clang that doesn't support fortran
+RUN set -ex \
+  ; if grep -q clang compiler.lst \
+  ; then \
+         apt-get update -y \
+      && apt-get upgrade -y \
+      && apt-get install -y --no-install-recommends \
+                 gfortran-10 \
+      && apt-get autoremove -y \
+      && apt-get clean -y \
+      && apt-get autoclean -y \
+      && rm -rf /var/lib/apt/lists/*  \
+  ; fi
+
+
 SHELL ["docker-shell"]
 ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
 CMD ["interactive-shell"]
diff --git a/spack/4b-squash/Dockerfile b/spack/4b-squash/Dockerfile
@@ -16,6 +16,21 @@ COPY --from=builder ${SPACK_ROOT} ${SPACK_ROOT}
 COPY --from=builder ${SPACK_INSTALL} ${SPACK_INSTALL}
 
 
+# use system gfortran for clang that doesn't support fortran
+RUN set -ex \
+  ; if grep -q clang compiler.lst \
+  ; then \
+         apt-get update -y \
+      && apt-get upgrade -y \
+      && apt-get install -y --no-install-recommends \
+                 gfortran-10 \
+      && apt-get autoremove -y \
+      && apt-get clean -y \
+      && apt-get autoclean -y \
+      && rm -rf /var/lib/apt/lists/*  \
+  ; fi
+
+
 SHELL ["docker-shell"]
 ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
 CMD ["interactive-shell"]
diff --git a/spack/5b-squash/Dockerfile b/spack/5b-squash/Dockerfile
@@ -17,6 +17,21 @@ COPY --from=builder ${SPACK_ROOT} ${SPACK_ROOT}
 COPY --from=builder ${SPACK_INSTALL} ${SPACK_INSTALL}
 
 
+# use system gfortran for clang that doesn't support fortran
+RUN set -ex \
+  ; if grep -q clang compiler.lst \
+  ; then \
+         apt-get update -y \
+      && apt-get upgrade -y \
+      && apt-get install -y --no-install-recommends \
+                 gfortran-10 \
+      && apt-get autoremove -y \
+      && apt-get clean -y \
+      && apt-get autoclean -y \
+      && rm -rf /var/lib/apt/lists/*  \
+  ; fi
+
+
 SHELL ["docker-shell"]
 ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
 CMD ["interactive-shell"]
diff --git a/spack/7-finalize/Dockerfile b/spack/7-finalize/Dockerfile
@@ -53,6 +53,21 @@ COPY --from=builder ${SPACK_ROOT}/var/spack/environments/pdienv/loads /etc/pdien
 COPY --from=builder /etc/pdienv.env.sh /etc/pdienv.env.sh
 
 
+# use system gfortran for clang that doesn't support fortran
+RUN set -ex \
+  ; if grep -q clang compiler.lst \
+  ; then \
+         apt-get update -y \
+      && apt-get upgrade -y \
+      && apt-get install -y --no-install-recommends \
+                 gfortran-10 \
+      && apt-get autoremove -y \
+      && apt-get clean -y \
+      && apt-get autoclean -y \
+      && rm -rf /var/lib/apt/lists/*  \
+  ; fi
+
+
 USER ci:ci
 WORKDIR /home/ci
 ENV HOME /home/ci