Add ros-melodic

alexspace360 · Apr 19, 2021 · c415135 · c415135
1 parent d7a6053
commit c415135
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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