Skip to content

Commit f765049

Browse files
committed
Fixed install
1 parent 7ce605e commit f765049

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

.docker/Dockerfile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,17 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
5454
# Install all ROS dependencies
5555
RUN vcs import src < src/$PROJECT_NAME/ros2.repos
5656
WORKDIR $USER_WORKSPACE
57-
# Skip for now while i fix
58-
# RUN sudo apt-get -q update \
59-
# && sudo apt-get -q -y upgrade \
60-
# && rosdep update \
61-
# && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} \
62-
# && sudo apt-get autoremove -y \
63-
# && sudo apt-get clean -y \
64-
# && sudo rm -rf /var/lib/apt/lists/*
57+
RUN sudo apt-get -q update \
58+
&& sudo apt-get -q -y upgrade \
59+
&& rosdep update \
60+
&& rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --skip-keys nlohmann_json \
61+
&& sudo apt-get autoremove -y \
62+
&& sudo apt-get clean -y \
63+
&& sudo rm -rf /var/lib/apt/lists/*
6564

6665
RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" \
67-
# && colcon build \
68-
# && echo "source ${USER_WORKSPACE}/install/setup.bash" >> /home/$USERNAME/.bashrc \
66+
&& colcon build \
67+
&& echo "source ${USER_WORKSPACE}/install/setup.bash" >> /home/$USERNAME/.bashrc \
6968
&& echo "if [ -f /opt/ros/${ROS_DISTRO}/setup.bash ]; then source /opt/ros/${ROS_DISTRO}/setup.bash; fi" >> /home/$USERNAME/.bashrc
7069

7170
WORKDIR $USER_WORKSPACE

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Then install the project dependencies using vcstool and rosdep
2323

2424
```bash
2525
vcs import src < src/waterlinked_dvl/ros2.repos && \
26-
rosdep install --from paths src -y --ignore-src
26+
rosdep install --from paths src -y --ignore-src --skip-keys nlohmann_json
2727
```
2828

2929
Finally, build the workspace using colcon

0 commit comments

Comments
 (0)