Commit ccee77fa authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Update docker files and gitlab CI file

parent 07b73fc8
......@@ -5,7 +5,7 @@ Setup
2 From the root of the repository, run (update version number and branch)
```
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/devel:14.04 -f .dockers/ubuntu-14.04/Dockerfile .
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:14.04 -f .dockers/ubuntu-14.04/Dockerfile .
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:14.04 -f .dockers/ubuntu-14.04/Dockerfile.premade .
```
......
FROM eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/devel:14.04
FROM eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:14.04
RUN /auto-install-hpp.sh --target doxygen-1.8.10.install
RUN /auto-install-hpp.sh --target OpenSceneGraph-dae-plugin.install
RUN /auto-install-hpp.sh --branch devel --target doxygen-1.8.10.install
RUN /auto-install-hpp.sh --branch devel --target OpenSceneGraph-dae-plugin.install
......@@ -3,7 +3,9 @@ FROM ubuntu:16.04
RUN echo "deb http://packages.ros.org/ros/ubuntu xenial 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-get update -qqy && apt-get install -qqy \
RUN apt-get update -qqy && apt-get upgrade -qqy
RUN apt-get install -qqy sudo wget
RUN apt-get install -qqy \
autoconf \
g++ \
cmake \
......@@ -32,7 +34,7 @@ RUN apt-get update -qqy && apt-get install -qqy \
omniidl-python \
libltdl-dev \
python-matplotlib \
libxml2 \
libxml2-dev \
libtinyxml2-dev \
liblog4cxx10-dev \
libltdl-dev \
......
FROM eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/devel:16.04
FROM eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:16.04
RUN /auto-install-hpp.sh --target OpenSceneGraph-dae-plugin.install
RUN /auto-install-hpp.sh --branch devel --target OpenSceneGraph-dae-plugin.install
......@@ -6,7 +6,7 @@ variables:
.build_template: &build_definition
stage: build
script: /auto-install-hpp.sh
script: /auto-install-hpp.sh --branch ${CI_COMMIT_REF_NAME}
artifacts:
paths:
- workspace
......
......@@ -37,7 +37,7 @@ esac
MAKE_TARBALL=false
TARGET=all
BRANCH=devel
BRANCH=""
if [ -z ${DEVEL_DIR} ]; then
export DEVEL_DIR=/local/devel/hpp
fi
......@@ -63,8 +63,14 @@ do
TARGET=$1
echo "Target set to $TARGET"
;;
--branch)
shift
BRANCH=$1
echo "Branch set to $BRANCH"
;;
--help)
echo "Options are"
echo "--branch: \tbranch which should be installed"
echo "--mktar: \tmake tar balls after compilation"
echo "--show-dep: \tshow dependencies resolved by aptitude"
echo "--target TARGET: \tinstall TARGET (default: all)"
......@@ -72,7 +78,7 @@ do
exit 0
;;
-v)
for v in "DEVEL_DIR" "BUILD_TYPE" "MAKE_TARBALL"
for v in "DEVEL_DIR" "BUILD_TYPE" "MAKE_TARBALL" "BRANCH"
do
echo "$v=${!v}"
done
......@@ -94,6 +100,11 @@ do
shift
done
if [ -z "${BRANCH}" ]; then
echo "A branch must be specified with argument --branch"
exit 1
fi
# standard HPP installation
sudo apt-get update -qqy
sudo apt-get --assume-yes install ${APT_DEP}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment