Updates dependencies in dockerfile

BumblebeeAS · Jul 12, 2023 · 6d0ac5f · 6d0ac5f
1 parent a989c84
commit 6d0ac5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/devcontainers/noetic/Dockerfile b/devcontainers/noetic/Dockerfile
@@ -91,7 +91,7 @@ RUN apt-get update && apt-get upgrade -y && \
 RUN apt-get install -y python-is-python3; \
     curl -kL https://bootstrap.pypa.io/get-pip.py | python && \
     pip3 install --upgrade pip && \
-    pip3 install --upgrade --ignore-installed --no-cache-dir pyassimp pylint==1.9.4 notebook~=5.7 Pygments matplotlib ipywidgets jupyter_contrib_nbextensions nbimporter supervisor supervisor_twiddler argcomplete
+    pip3 install --upgrade --ignore-installed --no-cache-dir pyassimp pylint==1.9.4 notebook~=5.7 Pygments matplotlib nbimporter supervisor supervisor_twiddler argcomplete
 
 # add non-root user
 RUN useradd -m ${USER} && \
@@ -101,15 +101,17 @@ RUN useradd -m ${USER} && \
 # eigen quadprog for controls
 RUN curl -1sLf \
   'https://dl.cloudsmith.io/public/mc-rtc/stable/setup.deb.sh' \
-  | sudo -E bash && apt-get update && apt-get upgrade && apt-get install -y libeigen-quadprog-dev \
+  | sudo -E bash && apt-get update && apt-get -y upgrade && apt-get install -y libeigen-quadprog-dev \
     && apt-get clean
 
 RUN pip3 install --upgrade --ignore-installed --no-cache-dir torch torchvision --extra-index-url https://download.pytorch.org/whl/cpu
 
 # deps for mission-planner
-RUN apt-get update && apt-get install -y qtbase5-dev libqt5svg5-dev libzmq3-dev libdw-dev ros-noetic-ros-babel-fish && apt-get clean
-RUN apt-get update && apt-get install -y ros-$ROS_DISTRO-foxglove-bridge && apt-get clean
-RUN pip3 install transforms3d
+RUN apt-get update && apt-get install -y qtbase5-dev libqt5svg5-dev libzmq3-dev libdw-dev ros-noetic-ros-babel-fish \
+ros-$ROS_DISTRO-foxglove-bridge \
+ros-$ROS_DISTRO-map-server \
+ros-$ROS_DISTRO-rosmon && apt-get clean
+RUN pip3 install transforms3d ultralytics pandas numpy==1.21 opencv-python motrackers
 
 
 # configure services

diff --git a/simulators/simulator-uuv/Dockerfile b/simulators/simulator-uuv/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ghcr.io/bumblebeeas/simulator_uuv_base:latest
 
-ADD supervisord.conf /etc/supervisor/supervisord.conf
+ADD .devcontainer_ros1/supervisord.conf /etc/supervisor/supervisord.conf
 
 RUN apt-get update && \
     apt-get install -y ros-noetic-actionlib-tools python3-tf-conversions && \
@@ -20,6 +20,10 @@ RUN apt-get update --fix-missing && \
     dpkg -i *.deb && \
     rm -rf /tmp/*.deb
 
+RUN pip3 install --no-cache-dir transforms3d
+RUN apt-get update && apt-get install -y ros-${ROS_DISTRO}-hector-gazebo-plugins\
+    ros-${ROS_DISTRO}-fcl && apt-get clean
+
 USER ${USER}
 
 ENV USER=developer