From 0ab2b473488c79850e117e9b0c271b2517781c2b Mon Sep 17 00:00:00 2001 From: cferreiragonz Date: Fri, 13 Jun 2025 09:50:31 +0200 Subject: [PATCH 1/2] Use humble with 2.x Signed-off-by: cferreiragonz --- .github/workflows/docker-reusable-workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-reusable-workflow.yml b/.github/workflows/docker-reusable-workflow.yml index 1a445e77a..d43bf0041 100644 --- a/.github/workflows/docker-reusable-workflow.yml +++ b/.github/workflows/docker-reusable-workflow.yml @@ -65,6 +65,7 @@ jobs: env: DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE: "ddsrouter:ci" DDSROUTER_COMPOSE_TEST_ROS2_DOCKER_IMAGE: "vulcanexus:ci" + VULCANEXUS_IMAGE: ${{ startsWith(inputs.fastdds_branch, '2.') && 'eprosima/vulcanexus:humble-core' || 'eprosima/vulcanexus:jazzy-core' }} steps: @@ -80,7 +81,7 @@ jobs: cd ./src/.github/docker/vulcanexus docker build \ --no-cache \ - --build-arg docker_image_base=eprosima/vulcanexus:jazzy-core \ + --build-arg docker_image_base=${{ env.VULCANEXUS_IMAGE }} \ -t ${{ env.DDSROUTER_COMPOSE_TEST_ROS2_DOCKER_IMAGE }} \ -f Dockerfile . From 5ad4819e4213ac24e1531ba60b7d78259c3bf708 Mon Sep 17 00:00:00 2001 From: cferreiragonz Date: Fri, 13 Jun 2025 11:01:07 +0200 Subject: [PATCH 2/2] Remove temp workaroud for ROS 2 apt keys Signed-off-by: cferreiragonz --- .github/docker/vulcanexus/Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/docker/vulcanexus/Dockerfile b/.github/docker/vulcanexus/Dockerfile index 95c5f2c3f..f5f709d64 100644 --- a/.github/docker/vulcanexus/Dockerfile +++ b/.github/docker/vulcanexus/Dockerfile @@ -16,12 +16,6 @@ SHELL ["/bin/bash", "-c"] ARG docker_image_base RUN echo "Docker Base image used: ${docker_image_base}" -# TODO: Remove once external issue is solved -# Update ROS 2 keys (not updated in the base image as of June 2025) -RUN rm /etc/apt/sources.list.d/ros2-latest.list && \ - curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \ - 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 - # Install message interface and demo nodes required packages RUN source "/opt/vulcanexus/$VULCANEXUS_DISTRO/setup.bash" && \ apt-get update && \