Skip to content

Commit

Permalink
updates to packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
railgnam committed May 23, 2024
1 parent f8cb186 commit 954bc66
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 5 deletions.
30 changes: 30 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM gramaziokohler/ros-noetic-base:latest

LABEL maintainer "Anton Tetov <[email protected]>"

# Create local catkin workspace
ENV CATKIN_WS=/root/catkin_ws
RUN mkdir -p $CATKIN_WS/src
WORKDIR $CATKIN_WS

# copy repo to src
COPY . ./src/biodigitalmatter_ros

RUN source /opt/ros/${ROS_DISTRO}/setup.bash \
&& apt-get update \
&& rosdep update

RUN apt-get install python3-vcstool python3-catkin-tools -y

RUN vcs import src < src/biodigitalmatter_ros/dependencies.repos \
&& vcs import src < src/abb_robot_driver/pkgs.repos

RUN rosdep install -y --from-paths . --ignore-src --rosdistro ${ROS_DISTRO}

RUN /opt/ros/${ROS_DISTRO}/bin/catkin_make

RUN echo "source /usr/local/bin/ros_catkin_entrypoint.sh" >> /root/.bashrc
RUN echo 'source $CATKIN_WS/src/biodigitalmatter_ros/bashrc_fragment' >> /root/.bashrc

ENTRYPOINT ["roslaunch" "biodigitalmatter_ros" "bringup.lauch"]
CMD ["bash"]
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
ROS Noetic installation on Ubuntu 20.04 assumed.

```sh
grep -qxF 'source ~/catkin_ws/src/biodigitalmatter_ros/bashrc_fragment.sh' ~/.bashrc || echo 'source ~/catkin_ws/src/biodigitalmatter_ros/bashrc_fragment.sh' >> ~/.bashrc
sudo apt install python3-vcstool python3-catkin-tools
mkdir -p ~/catkin_ws/src
cd ~/catkin_ws/src
Expand All @@ -16,3 +17,5 @@ rosdep update
rosdep install --from-paths src --ignore-src -y
catkin build
```

Create an .env file based on .env.example adding the passwords needed.
15 changes: 15 additions & 0 deletions bashrc_fragment.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
source /opt/ros/noetic/setup.bash

export CATKIN_WS=~/catkin_ws

if [ -f $CATKIN_WS/devel/setup.bash ] ; then
source $CATKIN_WS/devel/setup.bash
fi

if [ -f $CATKIN_WS/src/biodigitalmatter_ros/.env ] ; then
set -a # automatically export all vars
source $CATKIN_WS/src/biodigitalmatter_ros/.env
set +a
fi

mkdir -p ~/rosbags
12 changes: 8 additions & 4 deletions dependencies.repos
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,23 @@ repositories:
type: git
url: https://github.com/compas-rrc/compas_rrc_ros.git
version: v1.1.3
file_server:
ros_file_server:
type: git
url: https://github.com/gramaziokohler/ros_file_server.git
version: master
abb:
type: git
url: https://github.com/ros-industrial/abb/
url: https://github.com/ros-industrial/abb.git
version: kinetic-devel
axis_camera: # need newer than what's in rosdep
type: git
url: https://github.com/ros-drivers/axis_camera
url: https://github.com/ros-drivers/axis_camera.git
version: noetic-devel
camera_info_manager_py: # upstream has no noetic release, axis dep
type: git
url: https://github.com/lucasw/camera_info_manager_py
url: https://github.com/lucasw/camera_info_manager_py.git
version: noetic-devel
abb_robot_driver:
type: git
url: https://github.com/ros-industrial/abb_robot_driver.git
version: master
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<exec_depend>compas_rrc_driver</exec_depend>
<exec_depend>abb_irb4600_40_255_moveit_config</exec_depend>
<exec_depend>file_server</exec_depend>
<exec_depend>depthai</exec_depend> <!-- luxonis -->
<exec_depend>depthai-ros</exec_depend> <!-- luxonis -->
<exec_depend>realsense2_camera</exec_depend>
<exec_depend>rgbd_launch</exec_depend> <!-- dep realsense2 -->
<exec_depend>axis_camera</exec_depend>
Expand Down

0 comments on commit 954bc66

Please sign in to comment.