From 432fc56d96da0bbd5eba5f25315a80119645feb5 Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <adelton@fedoraproject.org>
Date: Sun, 18 Jan 2026 10:47:21 +0100
Subject: teams/cloud/container: Remove the legacy non-namespaced labels

The discussion
in https://discussion.fedoraproject.org/t/f44-change-proposal-containerimageslabels-selfcontained/179010
and opinions in https://pagure.io/fesco/issue/3543
suggested making a clear cut and removing the legacy labels as well.

Reference: https://fedoraproject.org/wiki/Changes/ContainerImagesLabels
---
 teams/cloud/container.xml | 20 --------------------
 teams/eln/container.xml   | 10 ----------
 2 files changed, 30 deletions(-)

diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml
index cd41f71..9281fa3 100644
--- a/teams/cloud/container.xml
+++ b/teams/cloud/container.xml
@@ -27,11 +27,6 @@
 					<label name="org.opencontainers.image.licenses" value="MIT"/>
 					<label name="org.opencontainers.image.title" value="fedora"/>
 					<label name="org.opencontainers.image.version" value="rawhide"/>
-					<!-- Legacy attributes for backward compatibility -->
-					<label name="vendor" value="Fedora Project"/>
-					<label name="license" value="MIT"/>
-					<label name="name" value="fedora"/>
-					<label name="version" value="rawhide"/>
 				</labels>
 				<environment>
 					<env name="container" value="oci"/>
@@ -58,11 +53,6 @@
 					<label name="org.opencontainers.image.licenses" value="MIT"/>
 					<label name="org.opencontainers.image.title" value="fedora-minimal"/>
 					<label name="org.opencontainers.image.version" value="rawhide"/>
-					<!-- Legacy attributes for backward compatibility -->
-					<label name="vendor" value="Fedora Project"/>
-					<label name="license" value="MIT"/>
-					<label name="name" value="fedora-minimal"/>
-					<label name="version" value="rawhide"/>
 				</labels>
 				<environment>
 					<env name="container" value="oci"/>
@@ -89,11 +79,6 @@
 					<label name="org.opencontainers.image.licenses" value="MIT"/>
 					<label name="org.opencontainers.image.title" value="fedora-init"/>
 					<label name="org.opencontainers.image.version" value="rawhide"/>
-					<!-- Legacy attributes for backward compatibility -->
-					<label name="vendor" value="Fedora Project"/>
-					<label name="license" value="MIT"/>
-					<label name="name" value="fedora-init"/>
-					<label name="version" value="rawhide"/>
 				</labels>
 				<stopsignal>SIGRTMIN+3</stopsignal>
 			</containerconfig>
@@ -118,11 +103,6 @@
 					<label name="org.opencontainers.image.title" value="fedora-toolbox"/>
 					<label name="org.opencontainers.image.version" value="rawhide"/>
 					<label name="com.github.containers.toolbox" value="true"/>
-					<!-- Legacy attributes for backward compatibility -->
-					<label name="vendor" value="Fedora Project"/>
-					<label name="license" value="MIT"/>
-					<label name="name" value="fedora-toolbox"/>
-					<label name="version" value="rawhide"/>
 				</labels>
 				<environment>
 					<env name="container" value="oci"/>
diff --git a/teams/eln/container.xml b/teams/eln/container.xml
index 47a2798..bda4459 100644
--- a/teams/eln/container.xml
+++ b/teams/eln/container.xml
@@ -21,11 +21,6 @@
 					<label name="org.opencontainers.image.licenses" value="MIT"/>
 					<label name="org.opencontainers.image.title" value="fedora"/>
 					<label name="org.opencontainers.image.version" value="eln"/>
-					<!-- Legacy attributes for backward compatibility -->
-					<label name="vendor" value="Fedora Project"/>
-					<label name="license" value="MIT"/>
-					<label name="name" value="fedora"/>
-					<label name="version" value="eln"/>
 				</labels>
 				<environment>
 					<env name="container" value="oci"/>
@@ -52,11 +47,6 @@
 					<label name="org.opencontainers.image.title" value="fedora-toolbox"/>
 					<label name="org.opencontainers.image.version" value="eln"/>
 					<label name="com.github.containers.toolbox" value="true"/>
-					<!-- Legacy attributes for backward compatibility -->
-					<label name="vendor" value="Fedora Project"/>
-					<label name="license" value="MIT"/>
-					<label name="name" value="fedora-toolbox"/>
-					<label name="version" value="eln"/>
 				</labels>
 				<environment>
 					<env name="container" value="oci"/>
-- 
cgit v1.3.1+13