Skip to content

Commit 330b5b6

Browse files
authored
Merge pull request #1 from aliasrobotics/crystal
Added crystal port
2 parents 348131c + 8002c37 commit 330b5b6

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
FROM osrf/ros2:bouncy-ros-core
1+
FROM ros:crystal-ros-base-bionic
22

33
MAINTAINER Lander Usategui <lander@aliasrobotics.com>
44

55
# install ros2 packages
66
RUN apt-get update && apt-get install -y \
7-
ros-bouncy-ros-base \
87
python3-colcon-common-extensions \
98
&& rm -rf /var/lib/apt/lists/*
109

1110
COPY scenario2-local /root/ros2_ws/src/scenario2
1211

1312
RUN /bin/bash -c "cd /root/ros2_ws/ \
14-
&& source /opt/ros/bouncy/setup.bash \
15-
&& colcon build --merge-install --install-base /opt/ros/bouncy --packages-select scenario2 --cmake-args -DBUILD_TESTING=OFF \
13+
&& source /opt/ros/crystal/setup.bash \
14+
&& colcon build --merge-install --install-base /opt/ros/crystal --packages-select scenario2 --cmake-args -DBUILD_TESTING=OFF \
1615
&& cd && rm -r /root/ros2_ws"
1716

1817
RUN rm -rf /etc/update-motd.d/* && rm -rf /etc/legal && sed -i 's/\#force_color_prompt=yes/force_color_prompt=yes/' /root/.bashrc

launch_script.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
source /opt/ros/bouncy/setup.bash
3+
source /opt/ros/crystal/setup.bash
44

55
echo "*************************************************************"
66

scenario2-local/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(NOT CMAKE_CXX_STANDARD)
77
endif()
88

99
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
10-
add_compile_options(-Wall -Wextra -Wpedantic)
10+
add_compile_options(-Wall -Wextra -Wpedantic -Wunused-parameter)
1111
endif()
1212

1313
find_package(ament_cmake REQUIRED)

0 commit comments

Comments
 (0)