Skip to content

Commit 564b400

Browse files
committed
Bug fix in container
1 parent 5062a3b commit 564b400

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

dockerfiles/Dockerfile.spack-magix3d

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,20 @@ SHELL ["/bin/bash", "-c"]
1919
ENV TZ=Europe/Paris
2020
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
2121
#==========================================
22+
# wget libasound2 libdbus-glib-1-2 used by firefox for documentation
2223
RUN apt update &&\
2324
apt install -y build-essential cmake python3 python3-distutils unzip zip curl git libxt-dev libgl-dev gfortran autoconf pkg-config lsb-release file &&\
25+
apt install -y wget libasound2 libdbus-glib-1-2 &&\
2426
apt clean &&\
2527
rm -rf /var/lib/apt/lists/*
2628
#==========================================
29+
# Installation of firefox for magix3d documentation (wget installed above)
30+
RUN wget -O FirefoxSetup.tar.bz2 "https://download.mozilla.org/?product=firefox-latest&os=linux64" &&\
31+
tar xvf FirefoxSetup.tar.bz2 &&\
32+
mv firefox /opt &&\
33+
rm FirefoxSetup.tar.bz2 &&\
34+
ln -s /opt/firefox/firefox /usr/bin/firefox
35+
#==========================================
2736
RUN git clone --depth=1 -b v${SPACK_VERSION} https://github.com/spack/spack.git &&\
2837
git clone --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git &&\
2938
cp /spack_recipes/config/packages.yaml /spack/etc/spack/
@@ -38,7 +47,7 @@ RUN source /spack/share/spack/setup-env.sh &&\
3847
RUN source /spack/share/spack/setup-env.sh &&\
3948
spack env create meshing-env &&\
4049
spack env activate meshing-env &&\
41-
spack add py-pytest &&\
50+
spack add python@3 &&\
4251
spack add magix3d~smooth3d~pythonaddon+doc ^vtk-maillage~opengl2+qt ^qt+opengl &&\
4352
spack install &&\
4453
rm -rf /spack/var/spack/cache/*

0 commit comments

Comments
 (0)