all: dist

docker/all/Dockerfile

@@ -8,8 +8,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib:/opt/openrobots/lib
 USER root
 RUN echo "DIST=${DIST}" > /dist
 
-ADD build.sh build.py misc /
-RUN /build.sh
+ADD build.sh build.py /
+ADD dist/${DIST}.sh /dist.sh
+RUN bash /dist.sh
 
 ADD https://api.github.com/repos/nim65s/eigenpy/commits/topic/multipy2 /
 RUN /build.sh eigenpy

docker/all/build.sh

@@ -2,7 +2,7 @@
 
 source /dist
 
-export PROJECT=${1:-main}
+export PROJECT=$1
 export CTEST_PARALLEL_LEVEL=${2:-5}
 
 build() {
@@ -36,21 +36,8 @@ build() {
     make install
 }
 
-if [ "$PROJECT" = "main" ]
-then
-    if [ "$DIST" = "archlinux" ]
-    then pacman -Sy --noconfirm python2-numpy
-    fi
-    if [ "$DIST" = "centos7" ]
-    then
-        mkdir -p /src/boost
-        cd /src/boost
-        /install_boost.sh
-        make -C ~/robotpkg/graphics/urdfdom install
-    fi
-else
-    if [ "$DIST" = "centos7" ]
-    then export PATH=/usr/lib64/python2.7/site-packages/cmake/data/bin:$PATH
-    fi
-    build "$PROJECT"
+if [ "$DIST" = "centos7" ]
+then export PATH=/usr/lib64/python2.7/site-packages/cmake/data/bin:$PATH
 fi
+
+build "$PROJECT"

docker/all/dist/archlinux.sh

+#!/bin/bash -eux
+
+pacman -Sy --noconfirm python2-numpy

docker/all/dist/centos7.sh

+#!/bin/bash -eux
+
+BOOST_VERSION="1_72_0"
+
+yum install -q -y which wget
+yum erase -q -y boost-libs boost-devel boost-python36-devel python2-numpy numpy
+
+wget -q https://dl.bintray.com/boostorg/release/${BOOST_VERSION//_/.}/source/boost_${BOOST_VERSION}.tar.bz2
+tar xf boost_${BOOST_VERSION}.tar.bz2
+cd boost_${BOOST_VERSION}
+./bootstrap.sh --prefix=/usr/local
+patch << 'EOF'
+--- project-config.jam  2020-08-20 11:38:06.896289775 +0000
++++ project-confi.jam  2020-08-20 11:37:48.052239309 +0000
+@@ -18,7 +18,8 @@
+ import python ;
+ if ! [ python.configured ]
+ {
+-    using python : 2.7 : "/usr" ;
++    using python : 2.7 : /usr/bin/python2 : /usr/include/python2.7 : /usr/lib ;
++    using python : 3.6 : /usr/bin/python3 : /usr/include/python3.6m : /usr/lib ;
+ }
+
+ # List of --with-<library> and --without-<library>
+EOF
+./b2 install link=shared python=2.7,3.6
+echo /opt/openrobots/lib/python2.7/site-packages/ > /usr/lib/python2.7/site-packages/robotpkg.pth
+
+python2 -m pip install -U numpy
+python3 -m pip install -U numpy
+
+make -C ~/robotpkg/graphics/urdfdom install
+
+rm -rf /src/boost_${BOOST_VERSION}

docker/all/misc/install_boost.sh

-#!/bin/bash -eux
-
-BOOST_VERSION="1_72_0"
-
-wget https://dl.bintray.com/boostorg/release/${BOOST_VERSION//_/.}/source/boost_${BOOST_VERSION}.tar.bz2
-tar xvf boost_${BOOST_VERSION}.tar.bz2
-cd boost_${BOOST_VERSION}
-./bootstrap.sh --prefix=/usr/local
-#cp ../project-config.jam .
-./b2 install link=shared python=2.7,3.6
-rm -rf /src/boost