Skip to content

Commit 07d63f7

Browse files
committed
some changes
. added altair support . added openturns
1 parent c69b604 commit 07d63f7

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

feelpp-env/Dockerfile-altair

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

feelpp-env/Dockerfile-ubuntu-16.10

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
FROM ubuntu:16.10
22
MAINTAINER Feel++ Support <support@feelpp.org>
33

4-
4+
5+
6+
RUN apt-get -qq update && \
7+
apt-get -y --force-yes install \
8+
software-properties-common python-software-properties
9+
10+
RUN add-apt-repository 'deb http://ubuntu.openturns.org yakkety main'
11+
512
RUN apt-get -qq update && \
613
apt-get -y --force-yes install \
714
xauth cmake flex gcc-6 g++-6 clang-3.9 clang++-3.9 git ipython openmpi-bin pkg-config \
@@ -16,9 +23,11 @@ RUN apt-get -qq update && \
1623
libhdf5-openmpi-dev libeigen3-dev libcgal-dev \
1724
python-numpy python-vtk6 python-six python-ply \
1825
python-h5py python-urllib3 xterm tmux screen \
19-
gmsh libgmsh-dev libopenturns-dev \
26+
gmsh libgmsh-dev \
27+
libopenturns-dev python-openturns openturns-validation openturns-examples r-other-rot\
2028
paraview \
2129
&& apt-get autoremove \
2230
&& apt-get clean \
2331
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2432

33+

feelpp-env/mkimg.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ usage() {
1414

1515
fromos=
1616
fromtag=
17+
install_altair=
1718

1819
tag=
1920
while true; do
2021
case "$1" in
22+
-a|--altair) install_altair="$2" ; shift 2 ;;
2123
-f|--from) from="$2" ; shift 2 ;;
2224
-t|--tag) tag="$2" ; shift 2 ;;
2325
-c|--cxx) cxx="$2" ; shift 2 ;;
@@ -54,6 +56,10 @@ EOF
5456

5557
cat Dockerfile-$fromos-$fromtag >> "$dir/Dockerfile"
5658

59+
if [ "x$install_altair" = "x1" ]; then
60+
cat Dockerfile-altair >> "$dir/Dockerfile"
61+
fi
62+
5763
cat Dockerfile-feelpp >> "$dir/Dockerfile"
5864

5965
cp WELCOME feelpp.* $dir

project/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM feelpp/feelpp-libs:latest
1+
FROM feelpp/feelpp-base:latest
22
MAINTAINER Feel++ Support <support@feelpp.org>
33

44
ARG PROJECT_NAME="project"

0 commit comments

Comments
 (0)