From b9bd56f3cb8585e132f8afe8b0b3d9254eac8a55 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Mon, 2 Jun 2025 21:11:35 -0700 Subject: [PATCH] testing encode_version_and_sha --- docker/requirements.txt | 2 +- ros/humble/ubuntu/jammy/ros-core/Dockerfile | 10 +++--- ros/jazzy/ubuntu/noble/ros-core/Dockerfile | 10 +++--- ros/kilted/ubuntu/noble/ros-core/Dockerfile | 10 +++--- ros/manifest.yaml | 34 ++++++++++---------- ros/rolling/ubuntu/noble/ros-core/Dockerfile | 10 +++--- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/docker/requirements.txt b/docker/requirements.txt index 6d7bed435..1ca8c1c39 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@encode_version_and_sha#egg=docker_templates ###### Requirements with Version Specifiers ###### # See https://www.python.org/dev/peps/pep-0440/#version-specifiers diff --git a/ros/humble/ubuntu/jammy/ros-core/Dockerfile b/ros/humble/ubuntu/jammy/ros-core/Dockerfile index 84806be3a..c0e6b9cfc 100644 --- a/ros/humble/ubuntu/jammy/ros-core/Dockerfile +++ b/ros/humble/ubuntu/jammy/ros-core/Dockerfile @@ -18,13 +18,13 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* -# NOTE: this doesnt deal with snapshots repo as not clear what to install for those.. -# NOTE: How do we break cache and ensure rebuild if that version changes ? -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" \ +# 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.1.0/ros2-apt-source_1.1.0.jammy_all.deb \ + && echo "1600cb8cc28258a39bffc1736a75bcbf52d1f2db371a4d020c1b187d2a5a083b /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 + && rm -f /tmp/ros2-apt-source.deb \ + && rm -rf /var/lib/apt/lists/* # setup environment ENV LANG=C.UTF-8 diff --git a/ros/jazzy/ubuntu/noble/ros-core/Dockerfile b/ros/jazzy/ubuntu/noble/ros-core/Dockerfile index c529d6fbb..5e28f0348 100644 --- a/ros/jazzy/ubuntu/noble/ros-core/Dockerfile +++ b/ros/jazzy/ubuntu/noble/ros-core/Dockerfile @@ -18,13 +18,13 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* -# NOTE: this doesnt deal with snapshots repo as not clear what to install for those.. -# NOTE: How do we break cache and ensure rebuild if that version changes ? -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" \ +# 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.1.0/ros2-apt-source_1.1.0.noble_all.deb \ + && echo "35441f3092fd05773a3c397fab38661bec466584c7a1f1c05366579997cb5fe7 /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 + && rm -f /tmp/ros2-apt-source.deb \ + && rm -rf /var/lib/apt/lists/* # setup environment ENV LANG=C.UTF-8 diff --git a/ros/kilted/ubuntu/noble/ros-core/Dockerfile b/ros/kilted/ubuntu/noble/ros-core/Dockerfile index 4414243d4..b78ebd369 100644 --- a/ros/kilted/ubuntu/noble/ros-core/Dockerfile +++ b/ros/kilted/ubuntu/noble/ros-core/Dockerfile @@ -18,13 +18,13 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* -# NOTE: this doesnt deal with snapshots repo as not clear what to install for those.. -# NOTE: How do we break cache and ensure rebuild if that version changes ? -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" \ +# 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.1.0/ros2-apt-source_1.1.0.noble_all.deb \ + && echo "35441f3092fd05773a3c397fab38661bec466584c7a1f1c05366579997cb5fe7 /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 + && rm -f /tmp/ros2-apt-source.deb \ + && rm -rf /var/lib/apt/lists/* # setup environment ENV LANG=C.UTF-8 diff --git a/ros/manifest.yaml b/ros/manifest.yaml index e013a6ae5..1d88c52cb 100644 --- a/ros/manifest.yaml +++ b/ros/manifest.yaml @@ -339,23 +339,23 @@ release_names: - arm32v7 - arm64v8 tag_names: - ros-core: - aliases: - - "$release_name-ros-core" - - "$release_name-ros-core-$os_code_name" - ros-base: - aliases: - - "$release_name-ros-base" - - "$release_name-ros-base-$os_code_name" - - "$release_name" - robot: - aliases: - - "$release_name-robot" - - "$release_name-robot-$os_code_name" - perception: - aliases: - - "$release_name-perception" - - "$release_name-perception-$os_code_name" + # ros-core: + # aliases: + # - "$release_name-ros-core" + # - "$release_name-ros-core-$os_code_name" + # ros-base: + # aliases: + # - "$release_name-ros-base" + # - "$release_name-ros-base-$os_code_name" + # - "$release_name" + # robot: + # aliases: + # - "$release_name-robot" + # - "$release_name-robot-$os_code_name" + # perception: + # aliases: + # - "$release_name-perception" + # - "$release_name-perception-$os_code_name" debian: os_code_names: buster: diff --git a/ros/rolling/ubuntu/noble/ros-core/Dockerfile b/ros/rolling/ubuntu/noble/ros-core/Dockerfile index c7c05767a..e905e610b 100644 --- a/ros/rolling/ubuntu/noble/ros-core/Dockerfile +++ b/ros/rolling/ubuntu/noble/ros-core/Dockerfile @@ -18,13 +18,13 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* -# NOTE: this doesnt deal with snapshots repo as not clear what to install for those.. -# NOTE: How do we break cache and ensure rebuild if that version changes ? -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" \ +# 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.1.0/ros2-apt-source_1.1.0.noble_all.deb \ + && echo "35441f3092fd05773a3c397fab38661bec466584c7a1f1c05366579997cb5fe7 /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 + && rm -f /tmp/ros2-apt-source.deb \ + && rm -rf /var/lib/apt/lists/* # setup environment ENV LANG=C.UTF-8