Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dockerfile to build from dashing #13

Merged
merged 1 commit into from
Sep 23, 2019
Merged

Update Dockerfile to build from dashing #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .docker/overlay.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
repositories:
turtlebot3:
type: git
url: https://github.com/ROBOTIS-GIT/turtlebot3
version: ros2-devel
turtlebot3/turtlebot3_msgs:
type: git
url: https://github.com/ROBOTIS-GIT/turtlebot3_msgs.git
version: ros2-devel
turtlebot3/turtlebot3_simulations:
type: git
url: https://github.com/ROBOTIS-GIT/turtlebot3_simulations.git
version: ros2-devel
# turtlebot3:
# type: git
# url: https://github.com/ROBOTIS-GIT/turtlebot3
# version: ros2-devel
# turtlebot3/turtlebot3_msgs:
# type: git
# url: https://github.com/ROBOTIS-GIT/turtlebot3_msgs.git
# version: ros2-devel
# turtlebot3/turtlebot3_simulations:
# type: git
# url: https://github.com/ROBOTIS-GIT/turtlebot3_simulations.git
# version: ros2-devel
# cartographer/cartographer:
# type: git
# url: https://github.com/ROBOTIS-GIT/cartographer.git
# version: dashing
cartographer/cartographer_ros:
type: git
url: https://github.com/ros2/cartographer_ros.git
version: dashing
# cartographer/cartographer_ros:
# type: git
# url: https://github.com/ros2/cartographer_ros.git
# version: dashing
ros2/sros2:
type: git
url: https://github.com/ros2/sros2.git
Expand Down
10 changes: 10 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"cSpell.words": [
"SROS",
"byobu",
"roscon",
"rosswg",
"tmux",
"turtlebot"
]
}
14 changes: 8 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,23 @@ RUN vcs import src < overlay.repos

# install overlay package dependencies
RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
apt-get update && rosdep install -y \
apt-get update && apt-get install -y \
ros-$ROS_DISTRO-turtlebot3-cartographer \
ros-$ROS_DISTRO-turtlebot3-navigation2 \
ros-$ROS_DISTRO-turtlebot3-simulations \
ros-$ROS_DISTRO-turtlebot3-teleop \
&& rosdep install -y \
--from-paths \
src \
--ignore-src \
--skip-keys "\
ament_mypy \
dynamixel_sdk \
hls_lfcd_lds_driver \
turtlebot3_lidar \
libopensplice69 \
rti-connext-dds-5.3.1" \
&& rm -rf /var/lib/apt/lists/*

# build overlay package source
RUN touch $TB3_OVERLAY_WS/src/turtlebot3/turtlebot3_node/COLCON_IGNORE
# RUN touch $TB3_OVERLAY_WS/src/turtlebot3/turtlebot3_node/COLCON_IGNORE
RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
colcon build \
--symlink-install
Expand Down Expand Up @@ -68,4 +70,4 @@ RUN sed --in-place \
echo 'source "$TB3_OVERLAY_WS/install/setup.bash"' >> ~/.bashrc

ENV TURTLEBOT3_MODEL='burger' \
GAZEBO_MODEL_PATH=$TB3_OVERLAY_WS/src/turtlebot3/turtlebot3_simulations/turtlebot3_gazebo/models:$GAZEBO_MODEL_PATH
GAZEBO_MODEL_PATH=/opt/ros/$ROS_DISTRO/share/turtlebot3_gazebo/models:$GAZEBO_MODEL_PATH