diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:17:15 +0100 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2020-12-16 15:17:15 +0100 |
| commit | 289baa1aadd248940439698173caaa345ac0ba3d (patch) | |
| tree | 719f4cee23b2eb5b98b51fb7520336df920024ae /Dockerfile_gudhi_installation | |
| parent | 5a450e1d5e0faac25085fb96d756d5963d0a15c4 (diff) | |
| parent | b6a3def70b15baf2dda0844762dcd291e240d2c1 (diff) | |
Merge branch 'dfsg/latest' into debian/sid
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 . \ |