Skip to content

Revert "Fix Ci from key signing (#5220)" #5237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 5, 2025
Merged

Revert "Fix Ci from key signing (#5220)" #5237

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf50231
Revert "Fix Ci from key signing (#5220)"
Nils-ChristianIseke Jun 5, 2025
19ff3d4
Update Cache Version
Nils-ChristianIseke Jun 5, 2025
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
13 changes: 0 additions & 13 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,6 @@ APT::Install-Suggests "0";\n\
' > /etc/apt/apt.conf.d/01norecommend
ENV PYTHONUNBUFFERED 1

# Fix ROS 2 keys
RUN rm /etc/apt/sources.list.d/ros2-latest.list \
&& rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg

RUN apt-get update \
&& apt-get install -y ca-certificates curl

RUN export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}') ;\
curl -L -s -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo $VERSION_CODENAME)_all.deb" \
&& apt-get update \
&& apt-get install /tmp/ros2-apt-source.deb \
&& rm -f /tmp/ros2-apt-source.deb

Comment on lines 47 to -60
Copy link
Contributor Author

@Nils-ChristianIseke Nils-ChristianIseke Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure which of the changes introduced in 1345c22 should be kept as i am not fully aware of the reasoning behind the commit introducing those changes.

Copy link
Member

@SteveMacenski SteveMacenski Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are necessary due to https://discourse.ros.org/t/ros-signing-key-migration-guide/43937

Copy link
Member

@SteveMacenski SteveMacenski Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like from my testing that these were now reflected in the base ROS 2 docker images (that wasn't the case for awhile and this was introduced to get CI and Docker turning over) https://github.com/ros-navigation/nav2_docker/actions/runs/15473514147/job/43563549095

We can merge this in entirety now. Can you make this a non-draft and I can merge?

# install CI dependencies
ARG RTI_NC_LICENSE_ACCEPTED=yes
RUN apt-get update && \
Expand Down
Loading