From 7c44ab95cd93c96631f3aa72e7c9dd4a7831bddd Mon Sep 17 00:00:00 2001
From: Dominic Reber <dominic@aica.tech>
Date: Thu, 2 May 2024 13:06:27 +0200
Subject: [PATCH] Revert "feat: add metadata through LABELs (#103)"

This reverts commit c0d85cf6ee1a406bcdc4652e8cf7d98c03f268dd.
---
 .github/workflows/reusable-build-push.yml | 10 +++-------
 ros2_ws/Dockerfile                        |  9 ---------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/reusable-build-push.yml b/.github/workflows/reusable-build-push.yml
index 184fa79..62a8463 100644
--- a/.github/workflows/reusable-build-push.yml
+++ b/.github/workflows/reusable-build-push.yml
@@ -67,21 +67,17 @@ jobs:
 
       - id: tags
         run: |
-          BUILD_FLAGS=()
-
+          BUILD_FLAGS=()    
           BASE_TAG=${{ inputs.ros_distro }}
           BUILD_FLAGS+=(--build-arg BASE_TAG=${BASE_TAG})
+          echo "::debug::Using base image tag ${BASE_TAG}"
+          echo "build_flags=${BUILD_FLAGS[@]}" >> $GITHUB_OUTPUT
 
           VERSION_TAG="v${{ needs.check-version.outputs.version }}"
           IMAGE_TAGS="${VERSION_TAG},${VERSION_TAG}-${{ inputs.ros_distro}}","${{ inputs.ros_distro}}"
           GIT_TAG="${VERSION_TAG}-${{ inputs.ros_distro}}"
-          BUILD_FLAGS+=(--build-arg VERSION=${GIT_TAG})
-
-          echo "::debug::Using base image tag ${BASE_TAG}"
-          echo "Build flags: ${BUILD_FLAGS[@]}"
           echo "Image tags: ${IMAGE_TAGS}"
           echo "Git tag: ${GIT_TAG}"
-          echo "build_flags=${BUILD_FLAGS[@]}" >> $GITHUB_OUTPUT
           echo "image_tags=${IMAGE_TAGS}" >> $GITHUB_OUTPUT
           echo "git_tag=${GIT_TAG}" >> $GITHUB_OUTPUT
 
diff --git a/ros2_ws/Dockerfile b/ros2_ws/Dockerfile
index da3e581..efc3325 100644
--- a/ros2_ws/Dockerfile
+++ b/ros2_ws/Dockerfile
@@ -138,12 +138,3 @@ COPY --from=ros2-control / /
 
 # start as ROS user
 USER ${USER}
-
-# Metadata
-ARG VERSION
-ARG BASE_TAG
-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="docker.io/library/ros:${BASE_TAG}"
-LABEL tech.aica.image.metadata='{"type":"base/ws","base":{"name":"docker.io/library/ros","version":"'${BASE_TAG}'"}}'