Unverified Commit 81101b07 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #53 from nim65s/devel

Update ROS repository key
parents 52aabba6 da7415ba
FROM ubuntu:14.04
RUN apt-get update -qqy && apt-get install -qqy \
curl \
&& rm -rf /var/lib/apt/lists/*
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 echo "deb [arch=amd64] http://robotpkg.openrobots.org/wip/packages/debian/pub trusty robotpkg" > /etc/apt/sources.list.d/robotpkg.list
RUN echo "deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub trusty robotpkg" >> /etc/apt/sources.list.d/robotpkg.list
RUN curl http://robotpkg.openrobots.org/packages/debian/robotpkg.key | apt-key add -
RUN apt-get update -qqy && apt-get install -qqy \
autoconf \
asciidoc \
bison \
cmake \
flex \
git \
g++ \
libassimp-dev \
libboost-all-dev \
libcdd-dev \
libglpk-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 \
robotpkg-osg-dae \
robotpkg-qpoases+doc \
robotpkg-roboptim-core \
robotpkg-roboptim-trajectory \
robotpkg-romeo-description \
robotpkg-ros-baxter-common \
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 \
&& apt-get remove -qqy texlive-latex-base texlive-binaries ghostscript \
&& apt-get autoremove -qqy \
&& rm -rf /var/lib/apt/lists/*
COPY auto-install-hpp.sh /
FROM eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:14.04
ENV DEVEL_DIR /workspace
RUN /auto-install-hpp.sh --branch ubuntu-14.04 --target \
"doxygen-1.8.10.install \
eigen3.install"
FROM ubuntu:16.04
RUN apt-get update -qqy && apt-get install -qqy \
RUN apt-get update -y && apt-get install -y \
curl \
&& rm -rf /var/lib/apt/lists/*
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-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
RUN echo "deb [arch=amd64] http://robotpkg.openrobots.org/wip/packages/debian/pub xenial robotpkg" > /etc/apt/sources.list.d/robotpkg.list
RUN echo "deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub xenial robotpkg" >> /etc/apt/sources.list.d/robotpkg.list
RUN curl http://robotpkg.openrobots.org/packages/debian/robotpkg.key | apt-key add -
RUN apt-get update -qqy && apt-get install -qqy \
RUN apt-get update -y && apt-get install -y \
autoconf \
g++ \
cmake \
......@@ -61,8 +61,8 @@ RUN apt-get update -qqy && apt-get install -qqy \
libpcre3-dev \
sudo \
wget \
&& apt-get remove -qqy texlive-latex-base texlive-binaries ghostscript \
&& apt-get autoremove -qqy \
&& apt-get remove -y texlive-latex-base texlive-binaries ghostscript \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/*
COPY auto-install-hpp.sh /
......@@ -2,18 +2,18 @@ FROM ubuntu:18.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -qqy && apt-get install -qqy \
RUN apt-get update -y && apt-get install -y \
curl \
gnupg2 \
&& rm -rf /var/lib/apt/lists/*
RUN echo "deb http://packages.ros.org/ros/ubuntu bionic 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-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
RUN echo "deb [arch=amd64] http://robotpkg.openrobots.org/wip/packages/debian/pub bionic robotpkg" > /etc/apt/sources.list.d/robotpkg.list
RUN echo "deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub bionic robotpkg" >> /etc/apt/sources.list.d/robotpkg.list
RUN curl http://robotpkg.openrobots.org/packages/debian/robotpkg.key | apt-key add -
RUN apt-get update -qqy && apt-get install -qqy \
RUN apt-get update -y && apt-get install -y \
autoconf \
g++ \
cmake \
......@@ -64,8 +64,8 @@ RUN apt-get update -qqy && apt-get install -qqy \
libpcre3-dev \
sudo \
wget \
&& apt-get remove -qqy texlive-latex-base texlive-binaries ghostscript \
&& apt-get autoremove -qqy \
&& apt-get remove -y texlive-latex-base texlive-binaries ghostscript \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/*
COPY auto-install-hpp.sh /
......@@ -86,12 +86,6 @@ master-18.04-build:
- future
<<: *build_definition
ubuntu-14.04-build:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:14.04
only:
- ubuntu-14.04
<<: *build_definition
devel-16.04-build:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
only:
......@@ -123,14 +117,6 @@ master-18.04-test:
<<: *test_definition
ubuntu-14.04-test:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:14.04
dependencies:
- ubuntu-14.04-build
only:
- ubuntu-14.04
<<: *test_definition
devel-16.04-test:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
dependencies:
......@@ -165,14 +151,6 @@ master-18.04-doc:
- future
<<: *doc_definition
ubuntu-14.04-doc:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:14.04
dependencies:
- ubuntu-14.04-build
only:
- ubuntu-14.04
<<: *doc_definition
devel-16.04-doc:
image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/devel-premade:16.04
dependencies:
......
......@@ -27,7 +27,7 @@ You will find three files in the directory `${DEVEL_HPP_DIR}/tarball/`:
```
branch=$(git branch --no-color | grep \* | cut -d' ' -f2)
for ubuntu in 14.04 16.04 18.04
for ubuntu in 16.04 18.04
do
docker build -t eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/ubuntu:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile ./scripts
docker build -t eur0c.laas.fr:5000/humanoid-path-planner/hpp-doc/${branch}-premade:${ubuntu} -f .dockers/ubuntu-${ubuntu}/Dockerfile.premade ./scripts
......
......@@ -4,18 +4,6 @@
set -e
HOST_DIST=$(lsb_release -s -c)
case $HOST_DIST in
trusty)
APT_DEP="g++ cmake libboost-dev liburdfdom-dev libassimp-dev \
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 flex \
bison asciidoc source-highlight git libomniorb4-dev omniorb-nameserver \
omniidl omniidl-python libltdl-dev python-matplotlib libtinyxml2-dev \
liblog4cxx10-dev libltdl-dev qt4-dev-tools libqt4-opengl-dev \
libqtgui4 oxygen-icon-theme libopenscenegraph-dev libcdd-dev"
APT_BUILD_DEP=""
CONFIG_FILE="ubuntu-14.04-indigo.sh"
;;
xenial)
APT_DEP="g++ cmake doxygen libboost-dev liburdfdom-dev \
libassimp-dev ros-kinetic-xacro ros-kinetic-kdl-parser ros-kinetic-common-msgs \
......
#!/bin/bash
DISTRIBUTION=trusty
## Check whether we are inside LAAS.
DOMAINNAME=`hostname -d`
if [ "${DOMAINNAME}" = "laas.fr" ]; then
# Use mirror from LAAS
MIRROR="http://kiev.laas.fr/UBUNTU-MIRROR/"
else
MIRROR="http://archive.ubuntu.com/ubuntu/"
fi
# read arguments
if [ $# -ne 1 ] && [ $# -ne 2 ]; then
echo "usage: $0 <install-directory> <bash_script_to_launch>"
exit 1
fi
DST="$1"
if [ $# -eq 2 ]; then
SCRIPT="$2"
else
HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SCRIPT="$HERE/auto-install-hpp.sh"
fi
if [ -f ${SCRIPT} -a -r ${SCRIPT} ]; then
echo "Will run '/bin/bash ${SCRIPT}' in the fresh install."
else
echo "${SCRIPT} not found"
exit 1
fi
RUN=`basename "${SCRIPT}"`
### Install ubuntu
debootstrap ${DISTRIBUTION} "$DST" ${MIRROR}
### Configure the repositories
# ROS
sh -c "echo 'deb http://packages.ros.org/ros/ubuntu ${DISTRIBUTION} main' > ${DST}/etc/apt/sources.list.d/ros-latest.list"
chroot ${DST} /usr/bin/apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-key 0xB01FA116
# Ubuntu
sh -c "echo '# Intentionally empty' > ${DST}/etc/apt/sources.list"
sh -c "echo 'deb ${MIRROR} ${DISTRIBUTION} main universe' > ${DST}/etc/apt/sources.list.d/${DISTRIBUTION}.list"
# Update
chroot ${DST} /usr/bin/apt-get update
chroot ${DST} /usr/bin/apt-get --assume-yes upgrade
# Install dependencies
# FIXME: I do not know why this is not in the installed Ubuntu. Is wget missing in Ubuntu 14.04
# or is it deboostrap that is not installing the good version ?
chroot ${DST} /usr/bin/apt-get --assume-yes install wget
# This is required by OpenSceneGraph and is usually installed with Ubuntu 14.04 and graphic card
# drivers.
chroot ${DST} /usr/bin/apt-get --assume-yes install freeglut3-dev
### Run the script
cp "${SCRIPT}" "$DST/root/$RUN"
chroot "${DST}" /bin/bash "/root/$RUN"
Markdown is supported
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