Skip to content
Snippets Groups Projects
Commit ea0eacba authored by Ujwal Kundur's avatar Ujwal Kundur
Browse files

Add Fortan support required by root and few other packages

parent 856893a0
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
## ======================================================================================== ## ========================================================================================
FROM intel/oneapi-hpckit:2022.1.2-devel-ubuntu18.04 AS oneapi FROM intel/oneapi-hpckit:2022.1.2-devel-ubuntu18.04 AS oneapi
...@@ -39,6 +38,7 @@ RUN --mount=type=cache,target=/var/cache/apt \ ...@@ -39,6 +38,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
file \ file \
build-essential \ build-essential \
gdb \ gdb \
gfortran \
ghostscript \ ghostscript \
git \ git \
gnupg2 \ gnupg2 \
...@@ -142,6 +142,11 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \ ...@@ -142,6 +142,11 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \
&& spack mirror add docker /var/cache/spack-mirror \ && spack mirror add docker /var/cache/spack-mirror \
&& spack mirror list && spack mirror list
## This variable will change whenevery either spack.yaml or our spack package
## overrides change, triggering a rebuild
ARG CACHE_BUST="hash"
ARG CACHE_NUKE=""
## Setup our custom environment and package overrides ## Setup our custom environment and package overrides
COPY spack $SPACK_ROOT/eic-spack COPY spack $SPACK_ROOT/eic-spack
RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \ RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \
...@@ -152,10 +157,6 @@ RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \ ...@@ -152,10 +157,6 @@ RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \
&& spack env activate . \ && spack env activate . \
&& spack concretize && spack concretize
## This variable will change whenevery either spack.yaml or our spack package
## overrides change, triggering a rebuild
ARG CACHE_BUST="hash"
ARG CACHE_NUKE=""
## Now execute the main build (or fetch from cache if possible) ## Now execute the main build (or fetch from cache if possible)
## note, no-check-signature is needed to allow the quicker signature-less ## note, no-check-signature is needed to allow the quicker signature-less
......
...@@ -52,8 +52,8 @@ spack: ...@@ -52,8 +52,8 @@ spack:
paths: paths:
cc: /usr/bin/gcc cc: /usr/bin/gcc
cxx: /usr/bin/g++ cxx: /usr/bin/g++
f77: f77: /usr/bin/gfortran
fc: fc: /usr/bin/gfortran
flags: {} flags: {}
operating_system: ubuntu18.04 operating_system: ubuntu18.04
target: x86_64 target: x86_64
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment