Fix docker images

finos · Apr 2, 2021 · fbe4362 · fbe4362
1 parent 9972212
commit fbe4362
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -73,11 +73,11 @@ jobs:
 
   strategy:
     matrix:
-      Python27ManyLinux2010:
-        python.version: '2.7'
-        python_flag: '--python2'
-        manylinux_flag: '--manylinux2010'
-        artifact_name: 'cp27-cp27m-manylinux2010_x86_64'
+      # Python27ManyLinux2010:
+      #   python.version: '2.7'
+      #   python_flag: '--python2'
+      #   manylinux_flag: '--manylinux2010'
+      #   artifact_name: 'cp27-cp27m-manylinux2010_x86_64'
       Python37ManyLinux2010:
         python.version: '3.7'
         python_flag: ''

diff --git a/docker/python/manylinux2010/Dockerfile b/docker/python/manylinux2010/Dockerfile
@@ -6,14 +6,17 @@
 # the Apache License 2.0.  The full license can be found in the LICENSE file.
 #
 
-FROM quay.io/pypa/manylinux2010_x86_64
+# https://github.com/pypa/manylinux/issues/428#issuecomment-774729597
+FROM quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5
 RUN yum -y install rapidjson-devel sudo wget
 
 # Build new cmake
 RUN wget https://cmake.org/files/v3.15/cmake-3.15.4-Linux-x86_64.sh -q
 RUN mkdir /opt/cmake
 RUN printf "y\nn\n" | sh cmake-3.15.4-Linux-x86_64.sh --prefix=/opt/cmake > /dev/null
 RUN rm -fr cmake*.sh /opt/cmake/doc
+RUN rm -fr /usr/local/bin/cmake
+RUN rm -fr /usr/local/bin/ctest
 RUN rm -fr /opt/cmake/bin/cmake-gui
 RUN rm -fr /opt/cmake/bin/ccmake
 RUN rm -fr /opt/cmake/bin/cpack
@@ -51,7 +54,7 @@ RUN python3.8 -m pip install --ignore-installed auditwheel
 RUN python3.9 -m pip install --ignore-installed auditwheel
 
 # install boost
-RUN wget https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz >/dev/null 2>&1
+RUN wget https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz --no-check-certificate >/dev/null 2>&1
 RUN tar xfz boost_1_71_0.tar.gz
 # https://github.com/boostorg/build/issues/468
 RUN cd boost_1_71_0 && ./bootstrap.sh

diff --git a/docker/python/manylinux2014/Dockerfile b/docker/python/manylinux2014/Dockerfile
@@ -14,6 +14,8 @@ RUN wget https://cmake.org/files/v3.15/cmake-3.15.4-Linux-x86_64.sh -q
 RUN mkdir /opt/cmake
 RUN printf "y\nn\n" | sh cmake-3.15.4-Linux-x86_64.sh --prefix=/opt/cmake > /dev/null
 RUN rm -fr cmake*.sh /opt/cmake/doc
+RUN rm -fr /usr/local/bin/cmake
+RUN rm -fr /usr/local/bin/ctest
 RUN rm -fr /opt/cmake/bin/cmake-gui
 RUN rm -fr /opt/cmake/bin/ccmake
 RUN rm -fr /opt/cmake/bin/cpack
@@ -48,7 +50,7 @@ RUN python3.8 -m pip install --ignore-installed auditwheel
 RUN python3.9 -m pip install --ignore-installed auditwheel
 
 # install boost
-RUN wget https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz >/dev/null 2>&1
+RUN wget https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.gz --no-check-certificate >/dev/null 2>&1
 RUN tar xfz boost_1_71_0.tar.gz
 # https://github.com/boostorg/build/issues/468
 RUN cd boost_1_71_0 && ./bootstrap.sh
@@ -60,7 +62,7 @@ RUN python3.8 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'
 RUN python3.9 -m pip install 'numpy>=1.13.1' 'pandas>=0.22.0' 'pyarrow>=2.0.0'
 
 # install node
-RUN curl -sL https://rpm.nodesource.com/setup_10.x | sudo bash -
+RUN curl -sL https://rpm.nodesource.com/setup_14.x | sudo bash -
 RUN yum install -y nodejs
 
 RUN npm install --global yarn