File tree Expand file tree Collapse file tree 2 files changed +2
-7
lines changed
Expand file tree Collapse file tree 2 files changed +2
-7
lines changed Original file line number Diff line number Diff line change @@ -16,12 +16,6 @@ SHELL ["/bin/bash", "-c"]
1616ARG docker_image_base
1717RUN 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
2620RUN source "/opt/vulcanexus/$VULCANEXUS_DISTRO/setup.bash" && \
2721 apt-get update && \
Original file line number Diff line number Diff line change 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
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
You can’t perform that action at this time.
0 commit comments