From f5f27f44f918ca900f1602ca7b1efdd7477227c0ff4d786a329362308cc8fd42 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:26 +0000
Subject: [PATCH 1/6] [info=7b83a8a0ee9fd564a1552d7b23946fa7]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/micro-image?expand=0&rev=7
---
 _service         |  1 -
 micro-image.kiwi | 12 ++++--------
 2 files changed, 4 insertions(+), 9 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/micro-image.kiwi b/micro-image.kiwi
index 7d7b453..5802f05 100644
--- a/micro-image.kiwi
+++ b/micro-image.kiwi
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: MIT -->
 
-<!-- OBS-AddTag: bci/bci-micro:%OS_VERSION_ID_SP% bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE% bci/bci-micro:latest -->
+<!-- OBS-AddTag: opensuse/bci/bci-micro:%OS_VERSION_ID_SP% opensuse/bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE% opensuse/bci/bci-micro:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="6.5" name="micro-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% Micro Container Image</specification>
+    <specification>openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Micro Container Image</specification>
   </description>
   <preferences>
     <type image="docker">
       <containerconfig
-          name="bci/bci-micro"
+          name="opensuse/bci/bci-micro"
           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.micro">
-            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION% Micro Container Image"/>
+            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Micro Container Image"/>
             <label name="org.opencontainers.image.description" value="A micro 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 506a49a1e704fb902b9e22dd5dc9b342b034234aa1742b51ca7f99155367c682 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:41 +0000
Subject: [PATCH 2/6] [info=7cc1d44a49bc7220782c4e42362198f5]

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

diff --git a/config.sh b/config.sh
index 8332267..588ec28 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/micro-image.changes b/micro-image.changes
index 3693cbc..5053a70 100644
--- a/micro-image.changes
+++ b/micro-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 12:22:14 UTC 2023 - Dan Čermák <dcermak@suse.com>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Fri Jul 15 11:09:11 UTC 2022 - Dan Čermák <dcermak@suse.com>
 

From c1c8550fff6212656c84459719a4cc4c4f4402a2f49ef7d7f140c0d11d6f7985 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:06 +0000
Subject: [PATCH 3/6] [info=805e8d8b4eb0f27d069154d035c955dc]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/micro-image?expand=0&rev=17
---
 _service            | 2 +-
 micro-image.changes | 5 +++++
 micro-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/micro-image.changes b/micro-image.changes
index 5053a70..a1e50b4 100644
--- a/micro-image.changes
+++ b/micro-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/micro-image.kiwi b/micro-image.kiwi
index 5802f05..20c78e1 100644
--- a/micro-image.kiwi
+++ b/micro-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-micro:%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>

From f440637666effdfd18964444ed5ffcbe835c1b7e3dcfc090fb2cb3d7394ef16d 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:18 +0000
Subject: [PATCH 4/6] [info=0ee45f2356cf65b5ec44af64005ab588]

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

diff --git a/micro-image.changes b/micro-image.changes
index a1e50b4..cf9f2a1 100644
--- a/micro-image.changes
+++ b/micro-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 26 06:18:12 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- switch versioning to rolling Tumbleweed schema 
+
 -------------------------------------------------------------------
 Fri Mar  3 07:24:36 UTC 2023 - Dan Čermák <dcermak@suse.com>
 
diff --git a/micro-image.kiwi b/micro-image.kiwi
index 20c78e1..520f4a4 100644
--- a/micro-image.kiwi
+++ b/micro-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.micro">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Micro Container Image"/>
             <label name="org.opencontainers.image.description" value="A micro 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-micro:%OS_VERSION_ID_SP%.%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-micro:%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 5766e924afab7b6f5ca52f1584237495e02991bc3e7eab0f635430e1f5d5df0f 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:18:00 +0000
Subject: [PATCH 5/6] [info=2b1187e5155a88cd49ab0cdc296d3ca7]

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

diff --git a/micro-image.changes b/micro-image.changes
index cf9f2a1..e0d3c1b 100644
--- a/micro-image.changes
+++ b/micro-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:12 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/micro-image.kiwi b/micro-image.kiwi
index 520f4a4..a8c0b74 100644
--- a/micro-image.kiwi
+++ b/micro-image.kiwi
@@ -29,7 +29,8 @@
             <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-micro:%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 7cdaa93764d7518c3f65780174c84c231f9590aa893a8731b81907d823613631 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:00 +0000
Subject: [PATCH 6/6] [info=456e3ee83f33c3e2fff50fa0ca72d458]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/micro-image?expand=0&rev=29
---
 micro-image.changes | 5 +++++
 micro-image.kiwi    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/micro-image.changes b/micro-image.changes
index e0d3c1b..3a05e5e 100644
--- a/micro-image.changes
+++ b/micro-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/micro-image.kiwi b/micro-image.kiwi
index a8c0b74..fe354ef 100644
--- a/micro-image.kiwi
+++ b/micro-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% Micro Container Image</specification>
+    <specification>openSUSE Tumbleweed BCI openSUSE Tumbleweed Micro Container Image</specification>
   </description>
   <preferences>
     <type image="docker">
@@ -19,7 +19,7 @@
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.micro">
-            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Micro Container Image"/>
+            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI openSUSE Tumbleweed Micro"/>
             <label name="org.opencontainers.image.description" value="A micro 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%"/>