From e0c14b2a1c4d35f0c3f711849024ddd163d53136675d1611c41580915de932d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Wed, 23 Nov 2022 09:32:30 +0000
Subject: [PATCH 1/6] [info=bae2fffe7e7bb79ad400827f37fdfe09]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/minimal-image?expand=0&rev=6
---
 _service           |  1 -
 minimal-image.kiwi | 14 +++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/_service b/_service
index f5ca758..c910f60 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,4 @@
 <services>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service mode="buildtime" name="kiwi_label_helper"/>
-
 </services>
\ No newline at end of file
diff --git a/minimal-image.kiwi b/minimal-image.kiwi
index c25566f..7ebc5bd 100644
--- a/minimal-image.kiwi
+++ b/minimal-image.kiwi
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: MIT -->
 
-<!-- OBS-AddTag: bci/bci-minimal:%OS_VERSION_ID_SP% bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE% bci/bci-minimal:latest -->
+<!-- OBS-AddTag: opensuse/bci/bci-minimal:%OS_VERSION_ID_SP% opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE% opensuse/bci/bci-minimal:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="6.5" name="minimal-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>https://www.suse.com/</contact>
-    <specification>openSUSE Tumbleweed BCI %OS_VERSION% Minimal Container Image</specification>
+    <specification>openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Minimal Container Image</specification>
   </description>
   <preferences>
-    <type image="docker" derived_from="obsrepositories:/bci/bci-micro#latest">
+    <type image="docker" derived_from="obsrepositories:/opensuse/bci/bci-micro#latest">
       <containerconfig
-          name="bci/bci-minimal"
+          name="opensuse/bci/bci-minimal"
           tag="%OS_VERSION_ID_SP%"
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
           <!-- See https://en.opensuse.org/Building_derived_containers#Labels -->
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.minimal">
-            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION% Minimal Container Image"/>
+            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Minimal Container Image"/>
             <label name="org.opencontainers.image.description" value="A minimal environment for containers based on the SLE Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
@@ -30,12 +30,8 @@
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
 
             <label name="com.suse.release-stage" value="released"/>
-
           </suse_label_helper:add_prefix>
         </labels>
-
-
-
       </containerconfig>
     </type>
     <version>15.Tumbleweed.0</version>

From b8682c493e15fe4c87612debef8839808816634a5274cd5b1242aaa03b1ce1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Tue, 21 Feb 2023 08:48:48 +0000
Subject: [PATCH 2/6] [info=4b167f5ee4d076dd34c6c270825e5be1]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/minimal-image?expand=0&rev=11
---
 config.sh             | 2 +-
 minimal-image.changes | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config.sh b/config.sh
index a44c6b3..3f2b8b5 100644
--- a/config.sh
+++ b/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 
diff --git a/minimal-image.changes b/minimal-image.changes
index b6a8c73..5327548 100644
--- a/minimal-image.changes
+++ b/minimal-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 12:22:14 UTC 2023 - Dan Čermák <dcermak@suse.com>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Tue Jul 12 15:13:44 UTC 2022 - Dan Čermák <dcermak@suse.com>
 

From 99104978ba29f13f6fa4f8ffe95057d5e88a9d01e7f9e35c7debc6be760dfac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Fri, 3 Mar 2023 07:51:12 +0000
Subject: [PATCH 3/6] [info=58c84f24390426923c95cc920cdebc1d]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/minimal-image?expand=0&rev=16
---
 _service              | 2 +-
 minimal-image.changes | 5 +++++
 minimal-image.kiwi    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/_service b/_service
index c910f60..695a3f0 100644
--- a/_service
+++ b/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service mode="buildtime" name="kiwi_label_helper"/>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
 </services>
\ No newline at end of file
diff --git a/minimal-image.changes b/minimal-image.changes
index 5327548..2507eb1 100644
--- a/minimal-image.changes
+++ b/minimal-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  3 07:24:36 UTC 2023 - Dan Čermák <dcermak@suse.com>
+
+- Add org.opencontainers.image.source label set to %SOURCEURL%
+
 -------------------------------------------------------------------
 Mon Jan  2 12:22:14 UTC 2023 - Dan Čermák <dcermak@suse.com>
 
diff --git a/minimal-image.kiwi b/minimal-image.kiwi
index 7ebc5bd..8516de4 100644
--- a/minimal-image.kiwi
+++ b/minimal-image.kiwi
@@ -25,6 +25,7 @@
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
+            <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
             <label name="org.opensuse.reference" value="registry.opensuse.org/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>

From 44bb02f5fc3280f3e0d17a415b7a74cb0a724b34abfead7a8c805737f70a8dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Thu, 4 May 2023 13:20:24 +0000
Subject: [PATCH 4/6] [info=c8c65d1795cc0109d46aaed0b6d75ddf]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/minimal-image?expand=0&rev=22
---
 minimal-image.changes | 6 ++++++
 minimal-image.kiwi    | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/minimal-image.changes b/minimal-image.changes
index 2507eb1..6cabdba 100644
--- a/minimal-image.changes
+++ b/minimal-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 26 06:18:56 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- switch versioning to rolling Tumbleweed schema
+- Correct org.opensuse.reference label
+
 -------------------------------------------------------------------
 Fri Mar  3 07:24:36 UTC 2023 - Dan Čermák <dcermak@suse.com>
 
diff --git a/minimal-image.kiwi b/minimal-image.kiwi
index 8516de4..ceaeecc 100644
--- a/minimal-image.kiwi
+++ b/minimal-image.kiwi
@@ -18,7 +18,6 @@
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
-          <!-- See https://en.opensuse.org/Building_derived_containers#Labels -->
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.minimal">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Minimal Container Image"/>
             <label name="org.opencontainers.image.description" value="A minimal environment for containers based on the SLE Base Container Image."/>
@@ -27,7 +26,7 @@
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
 
             <label name="com.suse.release-stage" value="released"/>
@@ -35,7 +34,7 @@
         </labels>
       </containerconfig>
     </type>
-    <version>15.Tumbleweed.0</version>
+    <version>2023</version>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <rpm-excludedocs>true</rpm-excludedocs>

From 4c1681b5d0826f9603c84b422145f9eda443e95b70a97dd7508ab374f27604a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Tue, 20 Jun 2023 16:17:59 +0000
Subject: [PATCH 5/6] [info=2db4cc8498887d43c64aa6b7fe92a37d]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/minimal-image?expand=0&rev=24
---
 minimal-image.changes | 5 +++++
 minimal-image.kiwi    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/minimal-image.changes b/minimal-image.changes
index 6cabdba..95c0f8b 100644
--- a/minimal-image.changes
+++ b/minimal-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 30 06:52:56 UTC 2023 - Dan Čermák <dcermak@suse.com>
+
+- Add release stage and lifecycle url
+
 -------------------------------------------------------------------
 Wed Apr 26 06:18:56 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/minimal-image.kiwi b/minimal-image.kiwi
index ceaeecc..f67a737 100644
--- a/minimal-image.kiwi
+++ b/minimal-image.kiwi
@@ -29,7 +29,8 @@
             <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
 
-            <label name="com.suse.release-stage" value="released"/>
+            <label name="org.opensuse.release-stage" value="released"/>
+            <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime"/>
           </suse_label_helper:add_prefix>
         </labels>
       </containerconfig>

From c3a91cf8d9e96dd965da0445ea520361d5d4dd030a9b5d3931aab80cffb92848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 26 Jun 2023 10:30:10 +0000
Subject: [PATCH 6/6] [info=257f919bc83fefb054625408cfa96fe7]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/minimal-image?expand=0&rev=28
---
 minimal-image.changes | 5 +++++
 minimal-image.kiwi    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/minimal-image.changes b/minimal-image.changes
index 95c0f8b..c73fedf 100644
--- a/minimal-image.changes
+++ b/minimal-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 23 15:33:33 UTC 2023 - Dirk Mueller <dmueller@suse.com>
+
+- label capitalization and related cleanups
+
 -------------------------------------------------------------------
 Tue May 30 06:52:56 UTC 2023 - Dan Čermák <dcermak@suse.com>
 
diff --git a/minimal-image.kiwi b/minimal-image.kiwi
index f67a737..593410c 100644
--- a/minimal-image.kiwi
+++ b/minimal-image.kiwi
@@ -8,7 +8,7 @@
   <description type="system">
     <author>openSUSE Project</author>
     <contact>https://www.suse.com/</contact>
-    <specification>openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Minimal Container Image</specification>
+    <specification>openSUSE Tumbleweed BCI openSUSE Tumbleweed Minimal Container Image</specification>
   </description>
   <preferences>
     <type image="docker" derived_from="obsrepositories:/opensuse/bci/bci-micro#latest">
@@ -19,8 +19,8 @@
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.minimal">
-            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Minimal Container Image"/>
-            <label name="org.opencontainers.image.description" value="A minimal environment for containers based on the SLE Base Container Image."/>
+            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI openSUSE Tumbleweed Minimal"/>
+            <label name="org.opencontainers.image.description" value="openSUSE Tumbleweed Minimal container based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>