seems to work for amd

Author: Katie Hughes

.devcontainer/Dockerfile.amd64

@@ -1,4 +1,5 @@
-FROM ubuntu:22.04
+ARG UBUNTU_VERSION=22.04
+FROM ubuntu:${UBUNTU_VERSION}
 
 RUN apt-get update --fix-missing \
     && apt-get install -y --no-install-recommends \

.devcontainer/Dockerfile.arm64

@@ -1,4 +1,5 @@
-FROM arm64v8/ubuntu:22.04
+ARG UBUNTU_VERSION=22.04
+FROM arm64v8/ubuntu:${UBUNTU_VERSION}
 
 RUN apt-get update --fix-missing \
     && apt-get install -y --no-install-recommends \

.devcontainer/build.sh

@@ -1,10 +1,28 @@
 #!/usr/bin/env bash
+set -euo pipefail
+
+UBUNTU_VERSION="22.04"
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --ubuntu)
+      UBUNTU_VERSION="$2"
+      shift 2
+      ;;
+    *)
+      echo "Usage: $0 [--ubuntu 22.04|24.04]" >&2
+      exit 1
+      ;;
+  esac
+done
+
 ARCH=$(dpkg --print-architecture)
+echo "Building Docker image for architecture: $ARCH with Ubuntu: $UBUNTU_VERSION"
 
 if [ "$ARCH" == "amd64" ]; then
-  docker build -t spot_builder -f Dockerfile.amd64 .
+  docker build --build-arg UBUNTU_VERSION="$UBUNTU_VERSION" -t spot_builder -f Dockerfile.amd64 .
 elif [ "$ARCH" == "arm64" ]; then
-  docker build -t spot_builder -f Dockerfile.arm64 .
+  docker build --build-arg UBUNTU_VERSION="$UBUNTU_VERSION" -t spot_builder -f Dockerfile.arm64 .
 else
   echo "Unknown architecture: $ARCH" > /dev/stderr
   exit 1

.devcontainer/entrypoint.sh

@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
+UBUNTU_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d'"' -f2)
+
 cd /spot-cpp-sdk/cpp
 if [ -d build ]; then
   rm -r build
 fi
 mkdir build
 cd build
-cmake .. -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE -DBUILD_CHOREOGRAPHY_LIBS=ON -DBUILD_SHARED_LIBS=ON
+cmake .. -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE -DBUILD_CHOREOGRAPHY_LIBS=ON -DBUILD_SHARED_LIBS=ON -DDEB_NAME_SUFFIX="_ubuntu_$UBUNTU_VERSION"
 make -j8 install package

cpp/CMakeLists.txt

@@ -319,7 +319,8 @@ if (UNIX)
   # Packaging logic
   set(CPACK_GENERATOR "DEB")
   set(CPACK_PACKAGE_NAME "spot-cpp-sdk")
-  set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+  set(DEB_NAME_SUFFIX "" CACHE STRING "optional suffix appended to .deb filename")
+  set(CPACK_DEBIAN_FILE_NAME "${CPACK_PACKAGE_NAME}_${PROJECT_VERSION}_${CMAKE_SYSTEM_PROCESSOR}${DEB_NAME_SUFFIX}.deb")
   set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
   set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcli11-dev (>=2.1.2), libgrpc++-dev (>=1.30.2), libprotobuf-dev (>=3.12.4)")  # not picked up by shlibdeps, thus listed explicitly
   set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Boston Dynamics SDK Publisher <bd-sdk-publisher@bostondynamics.com>")