Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dockerfile for new base image #2916

Merged
merged 1 commit into from May 7, 2019
Merged

Update dockerfile for new base image #2916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions docker/Dockerfile
View file
Open in desktop
@@ -1,24 +1,25 @@
FROM dealii/dealii:v8.5.1-gcc-mpi-fulldepscandi-debugrelease
FROM tjhei/dealii:v9.0.1-full-v9.0.1-r5-gcc5

LABEL maintainer <rene.gassmoeller@mailbox.org>

# Build aspect
# Build aspect, replace git checkout command to create image for release
RUN git clone https://github.com/geodynamics/aspect.git ./aspect && \
mkdir aspect/build-release && \
cd aspect/build-release && \
git checkout master && \
cmake -DCMAKE_BUILD_TYPE=Release \
-DDEAL_II_DIR=$HOME/deal.II-install \
-DASPECT_PRECOMPILE_HEADERS=ON \
.. && \
make -j4 >log 2>&1 && \
make -j6 && \
mv aspect ../aspect-release && \
make clean && \
cd .. && \
mkdir build-debug && \
cd build-debug && \
cmake -DCMAKE_BUILD_TYPE=Debug \
-DDEAL_II_DIR=$HOME/deal.II-install \
-DASPECT_PRECOMPILE_HEADERS=ON \
.. && \
make -j4 >log 2>&1 && \
make -j6 && \
mv aspect $HOME/aspect/aspect && \
make clean

Expand Down