Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ ENV BASH_ENV="/etc/bash_env"

RUN sudo apt-get update && sudo apt-get upgrade -y

COPY install.sh /root/sas_force_sensor_bota/
COPY docker/install.sh /root/sas_force_sensor_bota/
RUN cd /root/sas_force_sensor_bota \
&& chmod +x install.sh \
&& . install.sh

RUN python3 -m pip install --upgrade dqrobotics --break-system-packages
RUN sudo sudo apt-get remove -y ros-jazzy-sas-force-sensor-bota
RUN mkdir -p /root/sas_force_sensor_bota_devel/src/
COPY . /root/sas_force_sensor_bota_devel/src/sas_force_sensor_bota
13 changes: 7 additions & 6 deletions docker/compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
services:
sas_force_sensor_bota_server:
build: .
build:
context: ..
dockerfile: docker/Dockerfile
environment:
- TIMEOUT=20
- DISPLAY
Expand All @@ -9,20 +11,19 @@ services:
volumes:
- ~/.Xauthority:/root/.Xauthority # x server related
- /tmp/.X11-unix:/tmp/.X11-unix:rw # x server related
- ../../sas_force_sensor_bota:/root/sas_force_sensor_bota_devel/src/sas_force_sensor_bota
command: /bin/bash -c "
cd /root/sas_force_sensor_bota_devel
&& colcon build
&& source install/setup.bash
&& timeout -s INT $$TIMEOUT ros2 launch sas_force_sensor_bota sas_force_sensor_bota_launch.py"

sas_force_sensor_bota_client:
build: .
build:
context: ..
dockerfile: docker/Dockerfile
environment:
- TIMEOUT=20
- ROS_DOMAIN_ID
volumes:
- ../../sas_force_sensor_bota:/root/sas_force_sensor_bota_devel/src/sas_force_sensor_bota
command: /bin/bash -c "
cd /root/sas_force_sensor_bota_devel
&& colcon build
Expand Down