diff options
author | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:15:38 +0100 |
---|---|---|
committer | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:15:38 +0100 |
commit | b6a3def70b15baf2dda0844762dcd291e240d2c1 (patch) | |
tree | df4d6b690d0fc7f46d259364fe4a6fcc85f62b40 /Dockerfile_gudhi_installation | |
parent | 1c05c20d7cf92c96b5036620cc892cb956c96785 (diff) | |
parent | cf36a3971fb6a0ed37577295d7f1f13a930d1dba (diff) |
Merge tag 'tags/gudhi-release-3.4.0' into dfsg/latest
Diffstat (limited to 'Dockerfile_gudhi_installation')
-rw-r--r-- | Dockerfile_gudhi_installation | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Dockerfile_gudhi_installation b/Dockerfile_gudhi_installation index 996dd06b..ebd21f8d 100644 --- a/Dockerfile_gudhi_installation +++ b/Dockerfile_gudhi_installation @@ -23,6 +23,9 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 +# Update again +RUN apt-get update + # Required for Gudhi compilation RUN apt-get install -y make \ g++ \ @@ -47,6 +50,15 @@ RUN apt-get install -y make \ pkg-config \ curl +RUN curl -LO "https://github.com/CGAL/cgal/releases/download/v5.1/CGAL-5.1.tar.xz" \ + && tar xf CGAL-5.1.tar.xz \ + && mkdir build \ + && cd build \ + && cmake -DCMAKE_BUILD_TYPE=Release ../CGAL-5.1/ \ + && make install \ + && cd .. \ + && rm -rf build CGAL-5.1 + RUN pip3 install \ numpy \ matplotlib \ @@ -58,9 +70,9 @@ RUN pip3 install \ # apt clean up RUN apt autoremove && rm -rf /var/lib/apt/lists/* -RUN curl -LO "https://github.com/GUDHI/gudhi-devel/releases/download/tags%2Fgudhi-release-3.2.0/gudhi.3.2.0.tar.gz" \ -&& tar xf gudhi.3.2.0.tar.gz \ -&& cd gudhi.3.2.0 \ +RUN curl -LO "https://github.com/GUDHI/gudhi-devel/releases/download/tags%2Fgudhi-release-3.3.0/gudhi.3.3.0.tar.gz" \ +&& tar xf gudhi.3.3.0.tar.gz \ +&& cd gudhi.3.3.0 \ && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_PYTHON=OFF -DPython_ADDITIONAL_VERSIONS=3 .. \ && make all test install \ && cmake -DWITH_GUDHI_PYTHON=ON . \ |