From 9e90902d7d214f8034466b972c286fa76b3fe10b Mon Sep 17 00:00:00 2001
From: Tobit Flatscher <53856473+2b-t@users.noreply.github.com>
Date: Sun, 4 Feb 2024 02:28:42 +0000
Subject: [PATCH] fix: Add default values to Dockerfile arguments

---
 templates/ros/docker/Dockerfile  | 8 ++++----
 templates/ros2/docker/Dockerfile | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/ros/docker/Dockerfile b/templates/ros/docker/Dockerfile
index ab90eb9..13ae0ac 100644
--- a/templates/ros/docker/Dockerfile
+++ b/templates/ros/docker/Dockerfile
@@ -3,7 +3,7 @@
 ##############
 FROM ros:noetic-robot as base
 
-ARG CATKIN_WORKSPACE_DIR=${CATKIN_WORKSPACE_DIR}
+ARG CATKIN_WORKSPACE_DIR="/catkin_ws"
 
 LABEL org.opencontainers.image.authors="tobit.flatscher@outlook.com"
 LABEL description="ROS Noetic Docker template"
@@ -31,9 +31,9 @@ ENV DEBIAN_FRONTEND=dialog
 #####################
 FROM base as dev
 
-ARG USERNAME=${USERNAME}
-ARG UID=${UID}
-ARG GID=${GID}
+ARG USERNAME="developer"
+ARG UID=1000
+ARG GID=1000
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/templates/ros2/docker/Dockerfile b/templates/ros2/docker/Dockerfile
index 52e417c..64ad6c5 100644
--- a/templates/ros2/docker/Dockerfile
+++ b/templates/ros2/docker/Dockerfile
@@ -3,7 +3,7 @@
 ##############
 FROM ros:humble-ros-base as base
 
-ARG AMENT_WORKSPACE_DIR=${AMENT_WORKSPACE_DIR}
+ARG AMENT_WORKSPACE_DIR="/ament_ws"
 
 LABEL org.opencontainers.image.authors="tobit.flatscher@outlook.com"
 LABEL description="ROS 2 Humble Docker template"
@@ -36,9 +36,9 @@ ENV DEBIAN_FRONTEND=dialog
 #####################
 FROM base as dev
 
-ARG USERNAME=${USERNAME}
-ARG UID=${UID}
-ARG GID=${GID}
+ARG USERNAME="developer"
+ARG UID=1000
+ARG GID=1000
 
 ENV DEBIAN_FRONTEND=noninteractive