From 58d79c972198938c6f3655a40540903e08242b36 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 9 Sep 2020 17:37:01 +0200 Subject: Use cgal 5.1 as only boost header only --- Dockerfile_for_pip | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'Dockerfile_for_pip') diff --git a/Dockerfile_for_pip b/Dockerfile_for_pip index 8f60e37c..98668a04 100644 --- a/Dockerfile_for_pip +++ b/Dockerfile_for_pip @@ -14,23 +14,24 @@ RUN mkdir -p /opt/cmake \ && sh cmake-3.16.2-Linux-x86_64.sh --skip-license --prefix=/opt/cmake \ && rm -f cmake-3.16.2-Linux-x86_64.sh -RUN git clone -b boost-1.73.0 --depth 1 https://github.com/boostorg/boost.git \ - && cd boost \ - && git submodule update --init \ - && ./bootstrap.sh --with-libraries=filesystem,program_options,system,thread,test \ - && ./b2 headers \ - && ./b2 install \ +# yum install boost-devel installs boost 1.53 and copy is the only way to install headers only boost +RUN wget https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz \ + && tar xf boost_1_73_0.tar.gz \ + && cd boost_1_73_0 \ + && ./bootstrap.sh \ + && ls \ + && cp -r boost /usr/local/include/ \ && cd .. \ && rm -rf boost -RUN wget https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-5.0.2/CGAL-5.0.2.tar.xz \ - && tar xf CGAL-5.0.2.tar.xz \ +RUN wget 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 \ - && /opt/cmake/bin/cmake -DCMAKE_BUILD_TYPE=Release ../CGAL-5.0.2/ \ + && /opt/cmake/bin/cmake -DCMAKE_BUILD_TYPE=Release ../CGAL-5.1/ \ && make install \ && cd .. \ - && rm -rf build CGAL-5.0.2 + && rm -rf build CGAL-5.1 ADD .github/build-requirements.txt / -- cgit v1.2.3 From 0f8d2bde932f350e25bed760db52ebfafef111fc Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 10 Dec 2020 11:18:44 +0100 Subject: Need to rebuild gudhi/pip_for_gudhi docker image --- Dockerfile_for_pip | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Dockerfile_for_pip') diff --git a/Dockerfile_for_pip b/Dockerfile_for_pip index 98668a04..8f9f2443 100644 --- a/Dockerfile_for_pip +++ b/Dockerfile_for_pip @@ -39,12 +39,14 @@ RUN /opt/python/cp35-cp35m/bin/pip install -r build-requirements.txt \ && /opt/python/cp36-cp36m/bin/pip install -r build-requirements.txt\ && /opt/python/cp37-cp37m/bin/pip install -r build-requirements.txt\ && /opt/python/cp38-cp38/bin/pip install -r build-requirements.txt\ - && /opt/python/cp38-cp38/bin/pip install twine + && /opt/python/cp39-cp39/bin/pip install -r build-requirements.txt\ + && /opt/python/cp39-cp39/bin/pip install twine ENV PYTHON35="/opt/python/cp35-cp35m/" ENV PYTHON36="/opt/python/cp36-cp36m/" ENV PYTHON37="/opt/python/cp37-cp37m/" ENV PYTHON38="/opt/python/cp38-cp38/" +ENV PYTHON38="/opt/python/cp39-cp39/" ENV PATH="/opt/cmake/bin:${PATH}" ENV PATH="/opt/rh/devtoolset-8/root/usr/bin:${PATH}" -- cgit v1.2.3 From ec4fe178813119fc4a37c5893e038d2c7b9736f1 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 10 Dec 2020 13:57:19 +0100 Subject: Typo for python 3.9 --- Dockerfile_for_pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile_for_pip') diff --git a/Dockerfile_for_pip b/Dockerfile_for_pip index 8f9f2443..d5ae6417 100644 --- a/Dockerfile_for_pip +++ b/Dockerfile_for_pip @@ -46,7 +46,7 @@ ENV PYTHON35="/opt/python/cp35-cp35m/" ENV PYTHON36="/opt/python/cp36-cp36m/" ENV PYTHON37="/opt/python/cp37-cp37m/" ENV PYTHON38="/opt/python/cp38-cp38/" -ENV PYTHON38="/opt/python/cp39-cp39/" +ENV PYTHON39="/opt/python/cp39-cp39/" ENV PATH="/opt/cmake/bin:${PATH}" ENV PATH="/opt/rh/devtoolset-8/root/usr/bin:${PATH}" -- cgit v1.2.3