Skip to content

Commit

Permalink
modify dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
Haneol Kim committed Jan 17, 2024
1 parent 23b4c32 commit 9fa4b5f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
3 changes: 3 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ RUN git clone https://github.com/j-marple-dev/slambox-sdk.git -b v0.2.0 --recurs
make -j && \
sudo make install

RUN echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/usr/local/lib" >> /home/user/.bashrc
RUN echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/usr/local/lib" >> /home/user/.zshrc

# Install ROS2 humble pre-requisites
RUN sudo apt-get update && sudo apt-get install -y python3-rosdep ros-humble-pluginlib python3-colcon-common-extensions

Expand Down
11 changes: 7 additions & 4 deletions docker/Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,16 @@ RUN echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/home/user/.local/lib" >> /ho
# Install SLAMBOX SDK
RUN sudo apt-get install -y libserial-dev
WORKDIR /home/user
RUN git clone https://github.com/j-marple-dev/slambox-sdk.git -b v0.1.0 && \
RUN git clone https://github.com/j-marple-dev/slambox-sdk.git -b v0.2.0 && \
mkdir -p slambox-sdk/build && \
cd slambox-sdk/build && \
cmake -G "Unix Makefiles" .. && \
make -j && \
sudo make install

RUN echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/usr/local/lib" >> /home/user/.bashrc
RUN echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/usr/local/lib" >> /home/user/.zshrc

# Install ROS2 humble pre-requisites
RUN sudo apt-get purge -y libtbb-dev \
&& sudo apt-get update \
Expand All @@ -77,9 +80,9 @@ RUN sudo apt-get purge -y libtbb-dev \
RUN mkdir -p ~/ros2_ws/src
COPY --chown=user:user ./ /home/user/ros2_ws/src/slambox_ros2

RUN /bin/bash -c '. /opt/ros/humble/setup.bash; cd ~/ros2_ws; colcon build -j1'
RUN echo "source ~/catkin_ws/install/setup.bash" >> ~/.bashrc
RUN echo "source ~/catkin_ws/install/setup.zsh" >> ~/.zshrc
RUN /bin/bash -c '. /opt/ros/humble/setup.bash; cd ~/ros2_ws; colcon build --parallel-workers 1'
RUN echo "source ~/ros2_ws/install/setup.bash" >> ~/.bashrc
RUN echo "source ~/ros2_ws/install/setup.zsh" >> ~/.zshrc
RUN rm -rf /home/user/ros2_ws/src

RUN echo "export ROS_MASTER_URI=http://192.168.0.138:11311" >> ~/.zshrc
Expand Down

0 comments on commit 9fa4b5f

Please sign in to comment.