Skip to content

Commit 821f6ce

Browse files
committed
Fix legacy docker stuff + pin sympy
1 parent ed76cd0 commit 821f6ce

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

fenics/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARG DOLFIN_CMAKE_CXX_FLAGS="-O2"
1818

1919
########################################
2020

21-
FROM ubuntu:24.04 as fenics-base
21+
FROM ubuntu:24.04 AS fenics-base
2222
# Usage of pip setuptools
2323
ENV DEB_PYTHON_INSTALL_LAYOUT=deb_system
2424

@@ -84,8 +84,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
8484
apt-get clean && \
8585
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
8686

87-
ENV VIRTUAL_ENV /fenics-env
88-
ENV PATH /fenics-env/bin:$PATH
87+
ENV VIRTUAL_ENV=/fenics-env
88+
ENV PATH=/fenics-env/bin:$PATH
8989
RUN python3 -m venv ${VIRTUAL_ENV}
9090

9191
# Install Python packages (via pip)
@@ -173,7 +173,7 @@ RUN wget -nc --quiet https://slepc.upv.es/download/distrib/slepc-${SLEPC_VERSION
173173
rm -rf /tmp/*
174174

175175

176-
FROM fenics-base as fenics-end-user
176+
FROM fenics-base AS fenics-end-user
177177
LABEL description="End user image"
178178

179179
ARG FIAT_BRANCH
@@ -188,7 +188,7 @@ ARG MAKEFLAGS
188188
WORKDIR /src
189189
ENV PETSC_DIR=/usr/local/petsc
190190
ENV PETSC_ARCH=linux-gnu-real-32
191-
ENV ENV DEB_PYTHON_INSTALL_LAYOUT=deb_system
191+
ENV DEB_PYTHON_INSTALL_LAYOUT=deb_system
192192

193193
RUN git clone --branch ${FIAT_BRANCH} --single-branch https://github.com/FEniCS/fiat.git && \
194194
git clone --branch ${FFC_BRANCH} --single-branch https://bitbucket.com/fenics-project/ffc.git && \
@@ -201,7 +201,7 @@ RUN cd fiat && python3 -m pip install --no-build-isolation --no-cache-dir . && \
201201
cd ../dijitso && python3 -m pip install --no-build-isolation --no-cache-dir . && \
202202
cd ../ffc && python3 -m pip install --no-build-isolation --no-cache-dir . && \
203203
cd ../ && python3 -m pip install --no-build-isolation --no-cache-dir ipython
204-
204+
RUN python3 -m pip install --no-build-isolation "sympy<1.14"
205205
RUN cd dolfin && \
206206
cmake -G Ninja -DCMAKE_BUILD_TYPE=${DOLFIN_CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${DOLFIN_CMAKE_CXX_FLAGS} -B build . && \
207207
ninja ${MAKEFLAGS} install -C build

0 commit comments

Comments
 (0)