Skip to content

Commit a88d9cf

Browse files
Use different Vulcanexus images for each Fast DDS version (#512)
* Use humble with 2.x Signed-off-by: cferreiragonz <[email protected]> * Remove temp workaroud for ROS 2 apt keys Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]>
1 parent 8abc3d8 commit a88d9cf

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

.github/docker/vulcanexus/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ SHELL ["/bin/bash", "-c"]
1616
ARG docker_image_base
1717
RUN echo "Docker Base image used: ${docker_image_base}"
1818

19-
# TODO: Remove once external issue is solved
20-
# Update ROS 2 keys (not updated in the base image as of June 2025)
21-
RUN rm /etc/apt/sources.list.d/ros2-latest.list && \
22-
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \
23-
echo "deb [signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null
24-
2519
# Install message interface and demo nodes required packages
2620
RUN source "/opt/vulcanexus/$VULCANEXUS_DISTRO/setup.bash" && \
2721
apt-get update && \

.github/workflows/docker-reusable-workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
env:
6666
DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE: "ddsrouter:ci"
6767
DDSROUTER_COMPOSE_TEST_ROS2_DOCKER_IMAGE: "vulcanexus:ci"
68+
VULCANEXUS_IMAGE: ${{ startsWith(inputs.fastdds_branch, '2.') && 'eprosima/vulcanexus:humble-core' || 'eprosima/vulcanexus:jazzy-core' }}
6869

6970
steps:
7071

@@ -80,7 +81,7 @@ jobs:
8081
cd ./src/.github/docker/vulcanexus
8182
docker build \
8283
--no-cache \
83-
--build-arg docker_image_base=eprosima/vulcanexus:jazzy-core \
84+
--build-arg docker_image_base=${{ env.VULCANEXUS_IMAGE }} \
8485
-t ${{ env.DDSROUTER_COMPOSE_TEST_ROS2_DOCKER_IMAGE }} \
8586
-f Dockerfile .
8687

0 commit comments

Comments
 (0)