Skip to content

Commit

Permalink
update dockerfile to include eloquent (SteveMacenski#184)
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveMacenski authored Mar 17, 2020
1 parent a0b2e3d commit 349a1d2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ros:dashing-ros-base-bionic
FROM ros:eloquent-ros-base-bionic

# USE BASH
SHELL ["/bin/bash", "-c"]
Expand All @@ -10,13 +10,13 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco

# slam_toolbox
RUN mkdir -p colcon_ws/src
RUN cd colcon_ws/src && git clone -b dashing-devel https://github.com/SteveMacenski/slam_toolbox.git
RUN source /opt/ros/dashing/setup.bash \
RUN cd colcon_ws/src && git clone -b eloquent-devel https://github.com/SteveMacenski/slam_toolbox.git
RUN source /opt/ros/eloquent/setup.bash \
&& cd colcon_ws \
&& rosdep update \
&& rosdep install -y -r --from-paths src --ignore-src --rosdistro=dashing -y
&& rosdep install -y -r --from-paths src --ignore-src --rosdistro=eloquent -y

RUN source /opt/ros/dashing/setup.bash \
RUN source /opt/ros/eloquent/setup.bash \
&& cd colcon_ws/ \
&& colcon build --cmake-args=-DCMAKE_BUILD_TYPE=Release \
&& colcon test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ rosdep install -q -y -r --from-paths src --ignore-src
Or install via apt

```
apt install ros-dashing-slam-toolbox
apt install ros-eloquent-slam-toolbox
```

Run your colcon build procedure of choice.
Expand Down

0 comments on commit 349a1d2

Please sign in to comment.