From 0b9b30eedc03500533502d178697bf6889ef2e3e Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sat, 9 May 2026 09:53:49 +0200 Subject: [PATCH 1/4] [TMP] use custom docker templates branch Signed-off-by: Mikael Arguedas --- docker/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/requirements.txt b/docker/requirements.txt index 6d7bed435..e3655d750 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -9,7 +9,7 @@ ros_buildfarm ###### Requirements with Repo Specifiers ###### # See https://pip.readthedocs.io/en/stable/reference/pip_install/#git -git+https://github.com/osrf/docker_templates.git@master#egg=docker_templates +git+https://github.com/osrf/docker_templates.git@tianons_feedback#egg=docker_templates ###### Requirements with Version Specifiers ###### # See https://www.python.org/dev/peps/pep-0440/#version-specifiers From 58af41813ba67f611943c35c551387d652fcdbde Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sat, 9 May 2026 09:55:17 +0200 Subject: [PATCH 2/4] commit generated dockerfiles Signed-off-by: Mikael Arguedas --- ros/humble/ubuntu/jammy/ros-core/Dockerfile | 4 ++-- ros/jazzy/ubuntu/noble/ros-core/Dockerfile | 4 ++-- ros/kilted/ubuntu/noble/ros-core/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ros/humble/ubuntu/jammy/ros-core/Dockerfile b/ros/humble/ubuntu/jammy/ros-core/Dockerfile index 9b1cecf48..6b51315a0 100644 --- a/ros/humble/ubuntu/jammy/ros-core/Dockerfile +++ b/ros/humble/ubuntu/jammy/ros-core/Dockerfile @@ -19,8 +19,8 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ # Setup ROS Apt sources -RUN curl -L -s -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-apt-source_1.2.0.jammy_all.deb \ - && echo "767884cf4ed03116b9d64438930a832ed854147ae435279a7924dfdf60f94433 /tmp/ros2-apt-source.deb" | sha256sum --strict --check \ +RUN curl -L -s -f -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-apt-source_1.2.0.jammy_all.deb \ + && echo "767884cf4ed03116b9d64438930a832ed854147ae435279a7924dfdf60f94433 */tmp/ros2-apt-source.deb" | sha256sum --strict --check \ && apt-get update \ && apt-get install /tmp/ros2-apt-source.deb \ && rm -f /tmp/ros2-apt-source.deb \ diff --git a/ros/jazzy/ubuntu/noble/ros-core/Dockerfile b/ros/jazzy/ubuntu/noble/ros-core/Dockerfile index 75c19002a..26146800a 100644 --- a/ros/jazzy/ubuntu/noble/ros-core/Dockerfile +++ b/ros/jazzy/ubuntu/noble/ros-core/Dockerfile @@ -19,8 +19,8 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ # Setup ROS Apt sources -RUN curl -L -s -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-apt-source_1.2.0.noble_all.deb \ - && echo "0804d9b13db770eb87019be414cd78378835228ad5fa801fc88758596dd8f7e5 /tmp/ros2-apt-source.deb" | sha256sum --strict --check \ +RUN curl -L -s -f -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-apt-source_1.2.0.noble_all.deb \ + && echo "0804d9b13db770eb87019be414cd78378835228ad5fa801fc88758596dd8f7e5 */tmp/ros2-apt-source.deb" | sha256sum --strict --check \ && apt-get update \ && apt-get install /tmp/ros2-apt-source.deb \ && rm -f /tmp/ros2-apt-source.deb \ diff --git a/ros/kilted/ubuntu/noble/ros-core/Dockerfile b/ros/kilted/ubuntu/noble/ros-core/Dockerfile index 2f0f12218..0126a8fbe 100644 --- a/ros/kilted/ubuntu/noble/ros-core/Dockerfile +++ b/ros/kilted/ubuntu/noble/ros-core/Dockerfile @@ -19,8 +19,8 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ # Setup ROS Apt sources -RUN curl -L -s -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-apt-source_1.2.0.noble_all.deb \ - && echo "0804d9b13db770eb87019be414cd78378835228ad5fa801fc88758596dd8f7e5 /tmp/ros2-apt-source.deb" | sha256sum --strict --check \ +RUN curl -L -s -f -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-apt-source_1.2.0.noble_all.deb \ + && echo "0804d9b13db770eb87019be414cd78378835228ad5fa801fc88758596dd8f7e5 */tmp/ros2-apt-source.deb" | sha256sum --strict --check \ && apt-get update \ && apt-get install /tmp/ros2-apt-source.deb \ && rm -f /tmp/ros2-apt-source.deb \ From 6a9de6d3aa5bc5b9f036ea307d9228a7ab27141c Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sat, 9 May 2026 09:56:06 +0200 Subject: [PATCH 3/4] update docker library Signed-off-by: Mikael Arguedas --- ros/ros | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ros/ros b/ros/ros index 3a1eb880e..8231135f8 100644 --- a/ros/ros +++ b/ros/ros @@ -9,7 +9,7 @@ GitRepo: https://github.com/osrf/docker_images.git Tags: humble-ros-core, humble-ros-core-jammy Architectures: amd64, arm64v8 -GitCommit: 6baec8a7ddecbfeb424ab8e9f8f81a5bce82ba4d +GitCommit: 58af41813ba67f611943c35c551387d652fcdbde Directory: ros/humble/ubuntu/jammy/ros-core Tags: humble-ros-base, humble-ros-base-jammy, humble @@ -31,7 +31,7 @@ Directory: ros/humble/ubuntu/jammy/perception Tags: jazzy-ros-core, jazzy-ros-core-noble Architectures: amd64, arm64v8 -GitCommit: fd0c0c943e25f48fe199593597ea21d3f3f5935d +GitCommit: 58af41813ba67f611943c35c551387d652fcdbde Directory: ros/jazzy/ubuntu/noble/ros-core Tags: jazzy-ros-base, jazzy-ros-base-noble, jazzy, latest @@ -53,7 +53,7 @@ Directory: ros/jazzy/ubuntu/noble/perception Tags: kilted-ros-core, kilted-ros-core-noble Architectures: amd64, arm64v8 -GitCommit: fd0c0c943e25f48fe199593597ea21d3f3f5935d +GitCommit: 58af41813ba67f611943c35c551387d652fcdbde Directory: ros/kilted/ubuntu/noble/ros-core Tags: kilted-ros-base, kilted-ros-base-noble, kilted From 383d7f817cc1450f559e57430ee3395db806ce90 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sat, 9 May 2026 20:59:43 +0200 Subject: [PATCH 4/4] Revert "[TMP] use custom docker templates branch" This reverts commit 0b9b30eedc03500533502d178697bf6889ef2e3e. --- docker/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/requirements.txt b/docker/requirements.txt index e3655d750..6d7bed435 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -9,7 +9,7 @@ ros_buildfarm ###### Requirements with Repo Specifiers ###### # See https://pip.readthedocs.io/en/stable/reference/pip_install/#git -git+https://github.com/osrf/docker_templates.git@tianons_feedback#egg=docker_templates +git+https://github.com/osrf/docker_templates.git@master#egg=docker_templates ###### Requirements with Version Specifiers ###### # See https://www.python.org/dev/peps/pep-0440/#version-specifiers