diff --git a/Dockerfile b/Dockerfile index e396cd3..b9302a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,26 @@ -FROM ros:kinetic-ros-base +FROM ros:melodic-ros-base # install ros tutorials packages RUN apt-get update && apt-get install -y \ - ros-kinetic-ros-tutorials \ - ros-kinetic-common-tutorials \ + ros-melodic-ros-tutorials \ + ros-melodic-common-tutorials \ python-pip \ - xvfb=2:1.18.4-0ubuntu0.7 \ - x11-apps=7.7+5+nmu1ubuntu1 \ - netpbm=2:10.0-15.3\ + xvfb=2:1.19.6-1ubuntu4.8 \ + x11-apps=7.7+6ubuntu1 \ + netpbm=2:10.0-15.3build1\ && rm -rf /var/lib/apt/lists/ # npm is needed by Jupyter ROS -RUN apt-get update && apt-get install -y npm wget +RUN apt-get update && apt-get install -y \ + libssl1.0-dev \ + node-gyp\ + nodejs-dev \ + npm \ + wget RUN npm install -g n RUN n stable -RUN pip install --upgrade pip==18.0 +RUN pip install --upgrade pip # RUN pip install \ # notebook==5.6.0 \ @@ -24,7 +29,12 @@ RUN pip install --upgrade pip==18.0 # matplotlib==2.2.2 \ # jupyterlab==0.33.4 -RUN pip install notebook ipywidgets ipykernel matplotlib jupyterlab +RUN pip install \ + notebook \ + ipywidgets \ + ipykernel \ + matplotlib \ + jupyterlab # Enable extensions in Jupyter Notebooks RUN jupyter nbextension enable --py widgetsnbextension @@ -60,4 +70,4 @@ RUN chown -R ${NB_UID} ${HOME} USER ${NB_USER} WORKDIR ${HOME} -CMD ["jupyter", "lab", "--no-browser", "--ip", "0.0.0.0","--allow-root"] \ No newline at end of file +CMD ["jupyter", "lab", "--no-browser", "--ip", "0.0.0.0","--allow-root"] diff --git a/Dockerfile.init b/Dockerfile.init index 6660b7f..b801438 100644 --- a/Dockerfile.init +++ b/Dockerfile.init @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y \ ros-kinetic-ros-tutorials \ ros-kinetic-common-tutorials \ python-pip \ - xvfb=2:1.18.4-0ubuntu0.7 \ + xvfb=2:1.18.4-0ubuntu0.11 \ x11-apps=7.7+5+nmu1ubuntu1 \ netpbm=2:10.0-15.3\ && rm -rf /var/lib/apt/lists/ diff --git a/Dockerfile.prev b/Dockerfile.prev index 26c81f6..bffeacb 100644 --- a/Dockerfile.prev +++ b/Dockerfile.prev @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y \ ros-kinetic-ros-tutorials \ ros-kinetic-common-tutorials \ python-pip \ - xvfb=2:1.18.4-0ubuntu0.7 \ + xvfb=2:1.18.4-0ubuntu0.11 \ x11-apps=7.7+5+nmu1ubuntu1 \ netpbm=2:10.0-15.3\ && rm -rf /var/lib/apt/lists/ diff --git a/README.md b/README.md index 1b941e5..0e87bd3 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ Once you go to the home page of your jupyter notebook, you can see that a new ta # ROS-Tutorials ## ROS Tutorial Jupyter Notebooks -Find updated Binder instance in HERE --> [Click me ![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/therobotacademy/ROS-Tutorials/master) -- corresponding to repository [Source repo](https://github.com/therobotacademy/ROS-Tutorials) +Find updated Binder instance in HERE --> [Click me ![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/eborghi10/ROS-Tutorials/melodic-devel) +- corresponding to repository [Source repo](https://github.com/eborghi10/ROS-Tutorials) This is the Binder instance of the ORIGINAL repo ____ [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/RobInLabUJI/ROS-Tutorials/master?urlpath=lab) - corresponding to repository [Source repo](https://github.com/RobInLabUJI/ROS-Tutorials) @@ -38,4 +38,4 @@ $ docker run --rm -it --name jupyteros -p 8888:8888 jupyterlab-ros-tutorials:lat # TRY THIS DOCKERIZED INSTALLATION -https://github.com/frankzickert/jupyterlab-configuration \ No newline at end of file +https://github.com/frankzickert/jupyterlab-configuration