@@ -69,15 +69,6 @@ RUN python3 -m pip install --upgrade pip && \
6969
7070RUN --mount=src=.,dst=$SRC_DIR $SRC_DIR/docker/install-cmake.sh
7171
72- ENV CC=/usr/bin/gcc-$GCC_MAJOR_VERSION \
73- CXX=/usr/bin/g++-$GCC_MAJOR_VERSION \
74- MPICC=/usr/bin/mpicc \
75- MPICXX=/usr/bin/mpicxx \
76- MPIEXEC=/usr/bin/mpirun
77- # The multi-line definition of arguments does not seem happy
78- # when a variable uses the value of another variable previously defined on the same line.
79- ENV OMPI_CC=$CC \
80- OMPI_CXX=$CXX
8172
8273# This stage is dedicated to TPLs uniquely.
8374# A multi-stage build patern will allow to extract what we need for the GEOSX build.
@@ -89,11 +80,6 @@ ARG BLD_DIR
8980# It is repeated because docker forgets about the ARGs after FROM statements.
9081ARG GCC_MAJOR_VERSION
9182
92- ENV FC=/usr/bin/gfortran-$GCC_MAJOR_VERSION \
93- MPIFC=/usr/bin/mpifort
94- # Again, troublesome multi-line definition.
95- ENV OMPI_FC=$FC
96-
9783RUN apt-get install -y --no-install-recommends \
9884 libtbb-dev \
9985 gfortran-$GCC_MAJOR_VERSION \
@@ -108,10 +94,6 @@ RUN apt-get install -y --no-install-recommends \
10894 ca-certificates \
10995 git
11096
111- # Copy docker environment file
112- # RUN --mount=src=.,dst=$SRC_DIR cp $SRC_DIR/docker/spack.yaml /
113- # COPY docker/gcc-ubuntu/spack.yaml /
114-
11597
11698# Clone branch with spack configs
11799# TODO decide landing place of spack recipes
@@ -167,16 +149,16 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \
167149 libxml2-utils \
168150 git \
169151 ghostscript \
170- ninja-build
152+ ninja-build \
171153# Necessary dependencies for pygeosx unit tests
172- python3-dev \
173- python3-sphinx \
174- python3-mpi4py \
175- python3-scipy \
176- python3-virtualenv \
177- python3-matplotlib \
178- python3-venv \
179- python3-pytest
154+ python3-dev \
155+ python3-sphinx \
156+ python3-mpi4py \
157+ python3-scipy \
158+ python3-virtualenv \
159+ python3-matplotlib \
160+ python3-venv \
161+ python3-pytest
180162
181163# Install `sccache` binaries to speed up the build of `geos`
182164RUN --mount=src=.,dst=$SRC_DIR $SRC_DIR/docker/install-sccache.sh
0 commit comments