From a99670d4e1572f690409f27983824a03120e877a Mon Sep 17 00:00:00 2001
From: Enrico Eberhard <32450951+eeberhard@users.noreply.github.com>
Date: Mon, 13 May 2024 16:17:03 +0200
Subject: [PATCH] fix: build args and metadata variables (#111)

* Redeclare build args before final metadata layer

* Use single quotes to escape varibales to be replaced in metadata
---
 ros2_ws/Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ros2_ws/Dockerfile b/ros2_ws/Dockerfile
index 69a8357..2e97cfc 100644
--- a/ros2_ws/Dockerfile
+++ b/ros2_ws/Dockerfile
@@ -147,9 +147,13 @@ USER ${USER}
 WORKDIR ${ROS2_WORKSPACE}
 
 # Metadata
+ARG BASE_IMAGE=docker.io/library/ros
+ARG BASE_TAG=iron
+ARG ROS_DISTRO=iron
+ARG VERSION=v0.0.0
 LABEL org.opencontainers.image.title="AICA ROS 2 image"
 LABEL org.opencontainers.image.description="AICA base ROS 2 image (includes ros2_control)"
 LABEL org.opencontainers.image.version="${VERSION}"
 LABEL org.opencontainers.image.base.name="${BASE_IMAGE}:${BASE_TAG}"
-LABEL tech.aica.image.metadata='{"type":"base/ws","base":{"name":"${BASE_IMAGE}:${BASE_TAG}","version":"${VERSION}"}}'
+LABEL tech.aica.image.metadata='{"type":"base/ws","base":{"name":"'${BASE_IMAGE}':'${BASE_TAG}'","version":"'${VERSION}'"}}'
 LABEL devcontainer.metadata='[{"containerUser": "ros2"}]'