From c41513597899f6e2655c6948a980f9fee12d5bdb Mon Sep 17 00:00:00 2001 From: GiordanoLaminetti Date: Mon, 19 Apr 2021 21:36:02 +0200 Subject: [PATCH] Add ros-melodic --- Dockerfile | 3 ++- docs/source/docker.rst | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6a94f9d..d6c712b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,10 @@ RUN if $build_dependences ; then \ libboost-all-dev libpcap-dev libssl-dev g++ ;\ ldconfig ;\ rm -rf /var/lib/apt/lists/* && apt-get clear ;\ - python3 -mpip install numpy pyopengl Pillow pybind11 pandas ; \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1;\ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 2;\ + python3 -mpip install --upgrade pip ; \ + python3 -mpip install numpy pyopengl Pillow pybind11 pandas ; \ python3 -mpip install poetry setuptools ; \ mkdir /slampy/program; fi diff --git a/docs/source/docker.rst b/docs/source/docker.rst index 4d68138..0ba0d40 100644 --- a/docs/source/docker.rst +++ b/docs/source/docker.rst @@ -22,13 +22,18 @@ for downloading the container you can type :: docker pull giordanolaminetti/slampy:tagname -with the addiction of ``-focal`` after ``tagname`` you can download the builds with ubuntu 20.04 (focal fossa), by default the docker are built over ubuntu 18.04:: +with the addiction of ``-focal`` after ``tagname`` you can download the builds with ubuntu 20.04 (focal fossa), by default the docker are built over ubuntu 18.04 (Bionic Beaver):: docker pull giordanolaminetti/slampy:latest-focal +with the addiction of ``-ros-melodic`` after ``tagname`` you can download the ubuntu 18.04 (Bionic Beaver) with ros noetic already installed :: + + docker pull giordanolaminetti/slampy:latest-ros-melodic + + with the addiction of ``-ros-noetic`` after ``tagname`` you can download the ubuntu 20.04 (focal fossa) with ros noetic already installed :: - docker pull giordanolaminetti/slampy:latest-focal + docker pull giordanolaminetti/slampy:latest-ros-noetic ---------------------- Build docker container