From a4ab547a5d0bb1b64914498bffcb4c5d684abf8a Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 17 Dec 2020 10:17:31 -0800 Subject: [PATCH 1/2] Install ros-ign from debian Signed-off-by: Nate Koenig --- docker/cloudsim_bridge/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/cloudsim_bridge/Dockerfile b/docker/cloudsim_bridge/Dockerfile index cd360e0f..ffe29d68 100644 --- a/docker/cloudsim_bridge/Dockerfile +++ b/docker/cloudsim_bridge/Dockerfile @@ -73,6 +73,12 @@ RUN sudo apt-get update \ ignition-dome \ && sudo apt-get clean +# install the ros to ign bridge +RUN sudo apt-get update \ + && sudo apt-get install -y \ + ros-melodic-ros-ign \ + && sudo apt-get clean -qq + # Make a couple folders for organizing docker volumes RUN mkdir ~/workspaces ~/other @@ -86,7 +92,6 @@ RUN rosdep update RUN mkdir -p subt_ws/src \ && cd subt_ws/src \ && git config --global http.postBuffer 1048576000 \ - && git clone https://github.com/ignitionrobotics/ros_ign -b melodic \ && git clone https://github.com/osrf/subt WORKDIR /home/$USERNAME/subt_ws From 3b180063b2a4e46ad70c31b27bbac6795cc4c8b9 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 17 Dec 2020 10:45:38 -0800 Subject: [PATCH 2/2] Install gcc 8 Signed-off-by: Nate Koenig --- docker/cloudsim_bridge/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/cloudsim_bridge/Dockerfile b/docker/cloudsim_bridge/Dockerfile index ffe29d68..27799ff7 100644 --- a/docker/cloudsim_bridge/Dockerfile +++ b/docker/cloudsim_bridge/Dockerfile @@ -34,8 +34,13 @@ RUN sudo apt-get update -qq \ wget \ net-tools \ iputils-ping \ + g++-8 \ && sudo apt-get clean -qq +RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8 + +RUN gcc --version + # Install AWS CLI. This is needed by cloudsim to capture ROS logs. RUN pip3 install --upgrade awscli=="1.16.220" VOLUME /root/.aws