premade docker

.gitlab-ci.yml

@@ -3,6 +3,5 @@ variables:
     GIT_SUBMODULE_STRATEGY: "recursive"
 
 build:
-    image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master:14.04
-    script: ./script/auto-install-hpp.sh
-
+    image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:14.04
+    script: /auto-install-hpp.sh

Dockerfile

@@ -3,5 +3,41 @@ FROM ubuntu:14.04
 RUN echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list
 RUN apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
 
-RUN apt update -qqy && apt install -qqy make wget git cmake
-RUN apt install -qqy libboost-all-dev
+RUN apt-get update -qqy && apt-get install -qqy \
+   autoconf \
+   asciidoc \
+   bison \
+   cmake \
+   flex \
+   git \
+   g++ \
+   libassimp-dev \
+   libboost-all-dev \
+   liblog4cxx10-dev \
+   libltdl-dev \
+   libomniorb4-dev \
+   libopenscenegraph-dev \
+   libqt4-opengl-dev \
+   libqtgui4 \
+   libtinyxml2-dev \
+   liburdfdom-dev \
+   make \
+   omniidl \
+   omniidl-python \
+   omniorb-nameserver \
+   oxygen-icon-theme \
+   python-matplotlib \
+   qt4-dev-tools \
+   ros-indigo-xacro \
+   ros-indigo-kdl-parser \
+   ros-indigo-common-msgs \
+   ros-indigo-tf \
+   ros-indigo-tf-conversions \
+   ros-indigo-libccd \
+   ros-indigo-octomap \
+   ros-indigo-resource-retriever \
+   ros-indigo-srdfdom \
+   ros-indigo-pr2-description \
+   source-highlight \
+   wget \
+   && rm -rf /var/lib/apt/lists/*

Dockerfile.premade

+FROM eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master:14.04
+
+COPY script/auto-install-hpp.sh /
+
+RUN /auto-install-hpp.sh --target doxygen-1.8.10.install
+RUN /auto-install-hpp.sh --target OpenSceneGraph-dae-plugin.install

README.md

@@ -16,3 +16,12 @@ visit the [HPP website](https://humanoid-path-planner.github.io/hpp-doc).
 For installation instructions, visit
 the [HPP website](https://humanoid-path-planner.github.io/hpp-doc/download.html?branch=devel)
 or [these instructions](doc/instructions.md).
+
+## Build docker images for CI
+
+```
+docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master:14.04 .
+docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:14.04 -f Dockerfile.premade .
+docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master:14.04
+docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:14.04
+```

script/auto-install-hpp.sh

@@ -14,6 +14,7 @@ libqtgui4 oxygen-icon-theme libopenscenegraph-dev"
 APT_BUILD_DEP=""
 
 MAKE_TARBALL=false
+TARGET=all
 
 BRANCH=devel
 if [ -z ${DEVEL_DIR} ]; then
@@ -36,11 +37,17 @@ do
       echo "${APT_BUILD_DEP}"
       exit 0
       ;;
+    --target)
+      shift
+      TARGET=$1
+      echo "Target set to $TARGET"
+      ;;
     --help)
       echo "Options are"
-      echo "--mktar:   \tmake tar balls after compilation"
-      echo "--show-dep:\tshow dependencies resolved by aptitude"
-      echo "-v:        \tshow variables and ask for confirm (must be last arg)"
+      echo "--mktar:          \tmake tar balls after compilation"
+      echo "--show-dep:       \tshow dependencies resolved by aptitude"
+      echo "--target TARGET:  \tinstall TARGET (default: all)"
+      echo "-v:               \tshow variables and ask for confirm (must be last arg)"
       exit 0
       ;;
     -v)
@@ -86,8 +93,7 @@ cd $DEVEL_DIR/src
 
 make -e robot_state_chain_publisher.install
 source ../config.sh
-make -e doxygen-1.8.10.install
-make -e all
+make -e $TARGET
 
 if [ ${MAKE_TARBALL} = true ]; then
   cd $DEVEL_DIR/