Skip to content

Commit 769f05f

Browse files
authored
Merge pull request #10 from ORNL-MDF/thesis
Use thesis spack install
2 parents 668787c + 768fdef commit 769f05f

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

docker/ubuntu

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ set -o noclobber \
4141
&& echo ' - [email protected]' \
4242
&& echo ' - exaca@master' \
4343
&& echo ' - additivefoam@main' \
44+
&& echo ' - thesis@master+mpi' \
4445
&& echo ' concretizer:' \
4546
&& echo ' unify: true' \
4647
&& echo ' config:' \
@@ -65,24 +66,6 @@ RUN cd /opt/spack-environment \
6566
RUN cd /opt/spack-environment && \
6667
spack env activate --sh -d . > activate.sh
6768

68-
# Install 3DThesis
69-
ENV THESIS_DIR=/opt/3DThesis
70-
RUN . /opt/spack-environment/activate.sh && \
71-
THESIS_VERSION=master.tar.gz && \
72-
THESIS_ARCHIVE=3DThesis-${THESIS_VERSION} && \
73-
THESIS_URL=https://github.com/ORNL-MDF/3DThesis/archive/refs/heads/${THESIS_VERSION} && \
74-
wget --quiet ${THESIS_URL} --output-document=${THESIS_ARCHIVE} && \
75-
mkdir -p 3dthesis && \
76-
tar -xf ${THESIS_ARCHIVE} -C 3dthesis --strip-components=1 && \
77-
rm -f ${THESIS_ARCHIVE} && \
78-
cd 3dthesis && \
79-
cmake -B build \
80-
-D CMAKE_INSTALL_PREFIX=${THESIS_DIR} \
81-
-D CMAKE_BUILD_TYPE=Debug && \
82-
cmake --build build && \
83-
cmake --install build && \
84-
echo 'export PATH="/opt/3DThesis/bin:$PATH"' >> /opt/spack-environment/activate.sh
85-
8669
# Set entry point
8770
RUN { \
8871
echo '#!/bin/sh' \

0 commit comments

Comments
 (0)