From 6d6775641bb0914b9d1fe47cf6da2a23c6d3a475 Mon Sep 17 00:00:00 2001
From: Andrew Jong <ajong@andrew.cmu.edu>
Date: Mon, 13 Jan 2025 14:29:21 -0500
Subject: [PATCH] Hotfix, install colcon. Also set default robot base image to
 ubuntu22

---
 .env                          | 2 +-
 robot/docker/Dockerfile.robot | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index b9f73eab6..56c721d60 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 PROJECT_NAME="airstack"
-PROJECT_VERSION="1.0.0"
+PROJECT_VERSION="1.0.1"
 # can replace with your docker hub username
 PROJECT_DOCKER_REGISTRY="airlab-storage.andrew.cmu.edu:5001/shared"
 DEFAULT_ISAAC_SCENE="omniverse://airlab-storage.andrew.cmu.edu:8443/Projects/AirStack/fire_academy.scene.usd"
diff --git a/robot/docker/Dockerfile.robot b/robot/docker/Dockerfile.robot
index a5ffc519e..6d718c068 100644
--- a/robot/docker/Dockerfile.robot
+++ b/robot/docker/Dockerfile.robot
@@ -1,6 +1,6 @@
-# either ubuntu:22.04 or l4t
+# either ubuntu:22.04 or l4t. ubuntu:22.04 is default
 ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
+FROM ${BASE_IMAGE:-ubuntu:22.04}
 
 # from https://github.com/athackst/dockerfiles/blob/main/ros2/humble.Dockerfile
 ENV DEBIAN_FRONTEND=noninteractive
@@ -76,7 +76,8 @@ RUN apt update -y && apt install -y \
     ros-humble-topic-tools \
     ros-humble-grid-map \
     ros-humble-domain-bridge \
-    libcgal-dev 
+    libcgal-dev \
+    python3-colcon-common-extensions
 RUN /opt/ros/humble/lib/mavros/install_geographiclib_datasets.sh