Skip to content

Commit 362efdd

Browse files
author
Adrian Auer
committed
merged changes from fix/jazzy
2 parents f9d4384 + 10f66e7 commit 362efdd

5 files changed

Lines changed: 23 additions & 44 deletions

File tree

.gitlab-ci.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,22 @@ RUN apt-get update -qq \
77
ros-${ROS_DISTRO}-std-msgs \
88
ros-${ROS_DISTRO}-geometry-msgs \
99
ros-${ROS_DISTRO}-diagnostic-msgs \
10-
# ament-cmake \
10+
ros-${ROS_DISTRO}-ament-cmake \
11+
ros-${ROS_DISTRO}-rmw-zenoh-cpp \
12+
python3-flake8 \
13+
python3-pytest-cov \
1114
&& rm -rf /var/lib/apt/lists/*
1215

1316
# PEP 668: https://docs.ros.org/en/independent/api/rosdep/html/pip_and_pep_668.html
1417
ENV PIP_BREAK_SYSTEM_PACKAGES=1
15-
# install flake and pytest-cov for testing
16-
RUN pip3 install --upgrade flake8 pytest-cov --user
1718

1819
EXPOSE 7000
1920

2021
ENV APP=/app/helloric_ui_com
2122

2223
COPY ./requirements.txt /tmp/requirements.txt
23-
RUN pip3 install -r /tmp/requirements.txt
24+
# TODO: use a venv or install debian packages instead
25+
RUN pip3 install -r /tmp/requirements.txt --break-system-packages
2426

2527
WORKDIR ${APP}
2628
COPY ./ric-messages ${APP}/ric-messages
@@ -35,5 +37,7 @@ COPY ./helloric_ui_com ${APP}/helloric_ui_com
3537
RUN . /opt/ros/${ROS_DISTRO}/setup.sh && \
3638
colcon build
3739

40+
ENV RMW_IMPLEMENTATION=rmw_zenoh_cpp
41+
3842
ENTRYPOINT ["/entrypoint.bash"]
3943
CMD ["ros2", "run", "helloric_ui_com", "helloric_ui_com"]

compose.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
services:
2+
helloric_ui_com:
3+
image: harbor.hb.dfki.de/helloric/ui_com:x64_jazzy_001
4+
build:
5+
context: .
6+
dockerfile: Dockerfile
7+
args:
8+
ROS_DISTRO: jazzy
9+
environment:
10+
PYTHONUNBUFFERED: 1
11+
ZENOH_CONFIG_OVERRIDE: >-
12+
connect/endpoints=["tcp/host.docker.internal:${ZENOH_ROUTER_PORT}"];mode="client"
13+
extra_hosts:
14+
- "host.docker.internal:host-gateway"

docker-compose.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

test.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22
docker compose build
3-
docker compose run helloric_ui_com bash -c "source /opt/ros/humble/setup.bash && launch_test /integration_tests/launch_testing/com_launch_test.py"
3+
docker compose run helloric_ui_com bash -c "source /opt/ros/jazzy/setup.bash && launch_test /integration_tests/launch_testing/com_launch_test.py"

0 commit comments

Comments
 (0)