diff --git a/.env b/.env index 070e7f471..85ebfaa06 100644 --- a/.env +++ b/.env @@ -12,7 +12,7 @@ PROJECT_NAME="airstack" # If you've run ./airstack.sh setup, then this will auto-generate from the git commit hash every time a change is made # to a Dockerfile or docker-compose.yaml file. Otherwise this can also be set explicitly to make a release version. # auto-generated from git commit hash -VERSION="0.20.8" +VERSION="0.20.9" # Image-tag discriminator ONLY (appears in the image tag suffix, e.g. ..._robot-x86-64_dev). # No Dockerfile consumes it: "prebuilt" does NOT bake the built ros_ws into the image today — # a real prebuilt (workspace-baked) stage is future work. Keep "dev" (mounted code, built live). diff --git a/docs/release_notes/index.md b/docs/release_notes/index.md index 5fb6e7398..742276553 100644 --- a/docs/release_notes/index.md +++ b/docs/release_notes/index.md @@ -21,6 +21,17 @@ its own notes. --> - Nothing yet. +## 0.20.9 — 2026-11-16 + +- **MAVROS is pinned to 2.14.0 in the robot and GCS images.** MAVROS 2.15.0 + creates its plugin nodes without the global remaps, so their topics and + services moved from `.../mavros/` to `.../mavros/mavros/`. + The public Jazzy apt repository has carried it since 2026-09-11, so images + built since then lost the topics the stack uses (`mavros/state`, + `mavros/setpoint_raw/*`, `mavros/local_position/odom`, ...). The images now + install `mavros`, `mavros-msgs`, `libmavconn` and `mavlink` from the ROS + snapshot of 2026-06-18. Remove the pin once the remaps are fixed. + ## 0.20.8 — 2026-09-04 - **Docs builds no longer copy AirSim scene binaries.** The `same-dir` diff --git a/gcs/docker/Dockerfile.gcs b/gcs/docker/Dockerfile.gcs index 1320aa769..6eeb221f8 100644 --- a/gcs/docker/Dockerfile.gcs +++ b/gcs/docker/Dockerfile.gcs @@ -2,13 +2,18 @@ FROM osrf/ros:jazzy-desktop-full SHELL ["/bin/bash", "-c"] +# Add the ROS snapshot to pin MAVROS to 2.14 +RUN curl -sSL "https://keyserver.ubuntu.com/pks/lookup?op=get&options=mr&search=0x4B63CF8FDE49746E98FA01DDAD19BAB3CBF125EA" -o /usr/share/keyrings/ros-snapshots.asc \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-snapshots.asc] http://snapshots.ros.org/jazzy/2026-06-18/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" > /etc/apt/sources.list.d/ros2-snapshot.list + # Install system dependencies RUN apt-get -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true update && \ apt-get -o APT::Get::AllowUnauthenticated=true install -y \ vim nano emacs wget curl tree sshpass \ iperf3 iftop iputils-ping net-tools htop \ cmake build-essential less jq python3-pip tmux gdb \ - ros-dev-tools ros-jazzy-mavros ros-jazzy-tf2* ros-jazzy-stereo-image-proc \ + ros-dev-tools ros-jazzy-mavros=2.14.0-1* ros-jazzy-tf2* ros-jazzy-stereo-image-proc \ + ros-jazzy-mavros-msgs=2.14.0-1* ros-jazzy-libmavconn=2.14.0-1* ros-jazzy-mavlink=2026.3.3-1* \ ros-jazzy-image-view ros-jazzy-topic-tools ros-jazzy-grid-map \ ros-jazzy-domain-bridge ros-jazzy-ros2cli python3-colcon-common-extensions \ libglib2.0-dev libcgal-dev openssh-server \ diff --git a/robot/docker/Dockerfile.robot b/robot/docker/Dockerfile.robot index b904ac301..a9312bdf5 100644 --- a/robot/docker/Dockerfile.robot +++ b/robot/docker/Dockerfile.robot @@ -251,6 +251,10 @@ RUN python3 -m pip install --no-cache-dir --break-system-packages --ignore-insta "setuptools==79.0.1" \ wheel +# Add the ROS snapshot to pin MAVROS to 2.14 +RUN curl -sSL "https://keyserver.ubuntu.com/pks/lookup?op=get&options=mr&search=0x4B63CF8FDE49746E98FA01DDAD19BAB3CBF125EA" -o /usr/share/keyrings/ros-snapshots.asc \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-snapshots.asc] http://snapshots.ros.org/${ROS_DISTRO}/2026-06-18/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" > /etc/apt/sources.list.d/ros2-snapshot.list + # Install runtime ROS2 packages. ros-dev-tools pulls in the compile toolchain # (cmake, build-essential) — deliberate, since `bws` builds in-container. # (ros-*-grid-map pulls CGAL in as a transitive dependency where it needs it.) @@ -258,8 +262,9 @@ RUN python3 -m pip install --no-cache-dir --break-system-packages --ignore-insta # own); per-robot Foxglove returns later as an opt-in stack include. RUN apt update -y && apt install -y --no-install-recommends \ ros-dev-tools \ - ros-${ROS_DISTRO}-mavros \ - ros-${ROS_DISTRO}-mavros-extras \ + ros-${ROS_DISTRO}-mavros=2.14.0-1* \ + ros-${ROS_DISTRO}-mavros-extras=2.14.0-1* \ + ros-${ROS_DISTRO}-mavros-msgs=2.14.0-1* ros-${ROS_DISTRO}-libmavconn=2.14.0-1* ros-${ROS_DISTRO}-mavlink=2026.3.3-1* \ ros-${ROS_DISTRO}-tf2* \ ros-${ROS_DISTRO}-stereo-image-proc \ ros-${ROS_DISTRO}-image-view \