Skip to content

Commit

Permalink
fix: correct build location
Browse files Browse the repository at this point in the history
  • Loading branch information
ChandimaFernando committed Mar 28, 2024
1 parent e4c7420 commit 914fcc1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
8 changes: 5 additions & 3 deletions docker/erobs-common-img/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ WORKDIR /root/ws/src
# TODO @ChandimaFernando. Revert back after tests. RUN git clone https://github.com/maffettone/erobs.git -b humble
RUN git clone https://github.com/ChandimaFernando/erobs.git -b humble_hande_control

WORKDIR /root/ws/src/erobs
RUN /bin/bash -c ". /root/ws/src/erobs/setup.sh"
RUN /bin/bash -c ". /root/ws/src/erobs/build.sh"
# WORKDIR /root/ws/src/erobs
RUN /bin/bash -c "ls ./erobs"

RUN /bin/bash -c ". ./erobs/setup.sh"
RUN /bin/bash -c ". ./erobs/build.sh"

WORKDIR /root/ws/

Expand Down
8 changes: 4 additions & 4 deletions docker/erobs-common-img/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ export CONFIG_PKG="ur3e_hande_moveit_config"
export CONFIG_FILE="ur.srdf"
export ROS_DISTRO=humble

# Enables the connection between the UR robot and the VM
# Enable the connection between the UR robot and the VM
podman run -it --network host --ipc=host --pid=host \
--env ROBOT_IP=$ROBOT_IP \
--env UR_TYPE=$UR_TYPE \
--env ROS_DISTRO=$ROS_DISTRO \
ghcr.io/chandimafernando/erobs-common-img:latest \
/bin/sh -c "printenv && . /opt/ros/${ROS_DISTRO}/setup.sh && . /root/ws/install/setup.sh && ros2 launch ur_robot_driver ur_control.launch.py ur_type:=${UR_TYPE} robot_ip:=${ROBOT_IP} launch_rviz:=false tool_voltage:=24"

# Runs gripper service to enable the gripper
# Run gripper service to enable the gripper
podman run -it --network host --ipc=host --pid=host \
ghcr.io/chandimafernando/erobs-common-img:latest \
/bin/bash -c ". /root/ws/install/setup.sh && \
ros2 run gripper_service gripper_service"
ros2 run gripper_service gripper_service"

# Launches move_group
# Launch move_group
podman run -it --network host --ipc=host --pid=host \
--env ROBOT_IP=$ROBOT_IP \
--env UR_TYPE=$UR_TYPE \
Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e

vcs import < src/ros2.repos src
vcs import < /root/ws/src/erobs/src/ros2.repos /root/ws/src/erobs/src
sudo apt-get update
rosdep update
rosdep install --from-paths src --ignore-src -y

0 comments on commit 914fcc1

Please sign in to comment.