diff --git a/ros/jazzy/ubuntu/noble/Containerfile b/ros/jazzy/ubuntu/noble/Containerfile index 9dba0f37..df8c03f7 100644 --- a/ros/jazzy/ubuntu/noble/Containerfile +++ b/ros/jazzy/ubuntu/noble/Containerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG BASE_IMAGE=docker.io/ubuntu:noble-20240801 +ARG BASE_IMAGE=docker.io/ubuntu:noble-20241015 # hadolint ignore=DL3006 FROM ${BASE_IMAGE} AS base @@ -20,6 +20,7 @@ EOF FROM base AS ros-core ARG ROS_PACKAGES_URI +ARG ROSDISTRO_PKGS_SYNC_DATE COPY --from=download /usr/share/keyrings/ros2-latest-archive-keyring.gpg /usr/share/keyrings/ros2-latest-archive-keyring.gpg @@ -43,6 +44,7 @@ RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-latest-archive-keyring.gpg ] ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 +ENV ROSDISTRO_PKGS_SYNC_DATE=$ROSDISTRO_PKGS_SYNC_DATE ENV ROS_DISTRO=jazzy # install ros2 packages diff --git a/ros/jazzy/ubuntu/noble/docker-bake.hcl b/ros/jazzy/ubuntu/noble/docker-bake.hcl index 3bfe9ade..b0f1c20b 100644 --- a/ros/jazzy/ubuntu/noble/docker-bake.hcl +++ b/ros/jazzy/ubuntu/noble/docker-bake.hcl @@ -13,9 +13,9 @@ variable "ROS_PACKAGE" { target "_common" { args = { - # BASE_IMAGE = "docker.io/ubuntu:noble-20240801" ROS_PACKAGES_URI = "http://packages.ros.org/ros2/ubuntu" RAW_GITHUBUSERCONTENT_BASE_URL = "https://raw.githubusercontent.com" + ROSDISTRO_PKGS_SYNC_DATE = "${formatdate("YYYY-MM-DD", timestamp())}" } dockerfile = "Containerfile" labels = { diff --git a/ros/jazzy/ubuntu/noble/test/controls/ros_jazzy.rb b/ros/jazzy/ubuntu/noble/test/controls/ros_jazzy.rb index a7d47bfc..a603d89b 100644 --- a/ros/jazzy/ubuntu/noble/test/controls/ros_jazzy.rb +++ b/ros/jazzy/ubuntu/noble/test/controls/ros_jazzy.rb @@ -9,6 +9,10 @@ its('content') { should eq 'C.UTF-8' } end +describe os_env('ROSDISTRO_PKGS_SYNC_DATE') do + its('content') { should match /^\d{4}-\d{2}-\d{2}$/ } +end + describe file('/usr/share/keyrings/ros2-latest-archive-keyring.gpg') do it { should exist } end