-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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
[ros] switch ros rolling to ubuntu noble base image #16551
[ros] switch ros rolling to ubuntu noble base image #16551
Conversation
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Diff for dfc30b6:diff --git a/_bashbrew-cat b/_bashbrew-cat
index ea97bdf..435f9a8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -51,17 +51,17 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: 27cc0b68263bbbb10bb58dd814efc0a6b0a01ec7
Directory: ros/noetic/ubuntu/focal/ros-core
-Tags: rolling-perception, rolling-perception-jammy
+Tags: rolling-perception, rolling-perception-noble
Architectures: amd64, arm64v8
-GitCommit: 73c1bf4c30e97d5d3d7c2aaddc8137cae2411409
-Directory: ros/rolling/ubuntu/jammy/perception
+GitCommit: 026069e4a10a7e6d390db2bb0ce9d3f704e93919
+Directory: ros/rolling/ubuntu/noble/perception
-Tags: rolling-ros-base, rolling-ros-base-jammy, rolling
+Tags: rolling-ros-base, rolling-ros-base-noble, rolling
Architectures: amd64, arm64v8
-GitCommit: 73c1bf4c30e97d5d3d7c2aaddc8137cae2411409
-Directory: ros/rolling/ubuntu/jammy/ros-base
+GitCommit: 026069e4a10a7e6d390db2bb0ce9d3f704e93919
+Directory: ros/rolling/ubuntu/noble/ros-base
-Tags: rolling-ros-core, rolling-ros-core-jammy
+Tags: rolling-ros-core, rolling-ros-core-noble
Architectures: amd64, arm64v8
-GitCommit: 27cc0b68263bbbb10bb58dd814efc0a6b0a01ec7
-Directory: ros/rolling/ubuntu/jammy/ros-core
+GitCommit: 026069e4a10a7e6d390db2bb0ce9d3f704e93919
+Directory: ros/rolling/ubuntu/noble/ros-core
diff --git a/_bashbrew-list b/_bashbrew-list
index 0cd63db..9201837 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -24,8 +24,8 @@ ros:noetic-ros-core
ros:noetic-ros-core-focal
ros:rolling
ros:rolling-perception
-ros:rolling-perception-jammy
+ros:rolling-perception-noble
ros:rolling-ros-base
-ros:rolling-ros-base-jammy
+ros:rolling-ros-base-noble
ros:rolling-ros-core
-ros:rolling-ros-core-jammy
+ros:rolling-ros-core-noble
diff --git a/ros_rolling-perception-jammy/Dockerfile b/ros_rolling-perception-noble/Dockerfile
similarity index 78%
rename from ros_rolling-perception-jammy/Dockerfile
rename to ros_rolling-perception-noble/Dockerfile
index ce6b3c5..871f2fb 100644
--- a/ros_rolling-perception-jammy/Dockerfile
+++ b/ros_rolling-perception-noble/Dockerfile
@@ -1,9 +1,9 @@
# This is an auto generated Dockerfile for ros:perception
# generated from docker_images_ros2/create_ros_image.Dockerfile.em
-FROM ros:rolling-ros-base-jammy
+FROM ros:rolling-ros-base-noble
# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-rolling-perception=0.10.0-2* \
+ ros-rolling-perception=0.10.0-3* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_rolling-ros-core-jammy/Dockerfile b/ros_rolling-ros-core-noble/Dockerfile
similarity index 91%
rename from ros_rolling-ros-core-jammy/Dockerfile
rename to ros_rolling-ros-core-noble/Dockerfile
index f92c9df..cec19c4 100644
--- a/ros_rolling-ros-core-jammy/Dockerfile
+++ b/ros_rolling-ros-core-noble/Dockerfile
@@ -1,6 +1,6 @@
# This is an auto generated Dockerfile for ros:ros-core
# generated from docker_images_ros2/create_ros_core_image.Dockerfile.em
-FROM ubuntu:jammy
+FROM ubuntu:noble
# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
@@ -26,7 +26,7 @@ RUN set -eux; \
rm -rf "$GNUPGHOME"
# setup sources.list
-RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-latest-archive-keyring.gpg ] http://packages.ros.org/ros2/ubuntu jammy main" > /etc/apt/sources.list.d/ros2-latest.list
+RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-latest-archive-keyring.gpg ] http://packages.ros.org/ros2/ubuntu noble main" > /etc/apt/sources.list.d/ros2-latest.list
# setup environment
ENV LANG C.UTF-8
@@ -36,7 +36,7 @@ ENV ROS_DISTRO rolling
# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-rolling-ros-core=0.10.0-2* \
+ ros-rolling-ros-core=0.10.0-3* \
&& rm -rf /var/lib/apt/lists/*
# setup entrypoint
diff --git a/ros_rolling-ros-core-jammy/ros_entrypoint.sh b/ros_rolling-ros-core-noble/ros_entrypoint.sh
similarity index 100%
rename from ros_rolling-ros-core-jammy/ros_entrypoint.sh
rename to ros_rolling-ros-core-noble/ros_entrypoint.sh
diff --git a/ros_rolling/Dockerfile b/ros_rolling/Dockerfile
index 8bf569d..009ca86 100644
--- a/ros_rolling/Dockerfile
+++ b/ros_rolling/Dockerfile
@@ -1,6 +1,6 @@
# This is an auto generated Dockerfile for ros:ros-base
# generated from docker_images_ros2/create_ros_image.Dockerfile.em
-FROM ros:rolling-ros-core-jammy
+FROM ros:rolling-ros-core-noble
# install bootstrap tools
RUN apt-get update && apt-get install --no-install-recommends -y \
@@ -26,6 +26,6 @@ RUN colcon mixin add default \
# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-rolling-ros-base=0.10.0-2* \
+ ros-rolling-ros-base=0.10.0-3* \
&& rm -rf /var/lib/apt/lists/* Relevant Maintainers:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To validate this (and that y'all are aware that Noble isn't released yet 😄), I dug through the reference chain of osrf/docker_images#731 + osrf/docker_images#728 to https://discourse.ros.org/t/preparing-ros-2-rolling-for-the-transition-to-ubuntu-24-04/35673, which has the following especially important point:
Once Rolling has transitioned to 24.04 new Rolling packages will no longer be produced for Ubuntu 22.04.
👍 ❤️
No description provided.