Accepting request 1097012 from devel:BCI:Tumbleweed

- label capitalization and related cleanups

- Add release stage and lifecycle url

- Reduce busybox image size by removing Index.db
  Index.db is being created on demand by rpm(1) (as long as it is run as root)
  so we don't strictly have to ship it. currently the Index.db has a lot of
  empty space within which we could optimize away.
  until then removing the file saves 10% of the total compressed size.
- switch versioning to rolling Tumbleweed schema

- Add org.opencontainers.image.source label set to %SOURCEURL%

- Bump copyright year

OBS-URL: https://build.opensuse.org/request/show/1097012
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox-image?expand=0&rev=2

_service

@@ -1,5 +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>

busybox-image.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+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>
+
+- Add release stage and lifecycle url
+
+-------------------------------------------------------------------
+Tue Apr 25 22:24:05 UTC 2023 - Dirk Mueller <dmueller@suse.com>
+
+- Reduce busybox image size by removing Index.db
+
+  Index.db is being created on demand by rpm(1) (as long as it is run as root)
+  so we don't strictly have to ship it. currently the Index.db has a lot of
+  empty space within which we could optimize away.
+
+  until then removing the file saves 10% of the total compressed size.
+
+- switch versioning to rolling Tumbleweed schema
+
+-------------------------------------------------------------------
+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>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Fri Jul 15 11:09:19 UTC 2022 - Dan Čermák <dcermak@suse.com>
 

busybox-image.kiwi

@@ -1,44 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: MIT -->
 
-<!-- OBS-AddTag: bci/bci-busybox:%OS_VERSION_ID_SP% bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE% bci/bci-busybox:latest -->
+<!-- OBS-AddTag: opensuse/bci/bci-busybox:%OS_VERSION_ID_SP% opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE% opensuse/bci/bci-busybox:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="6.5" name="busybox-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% Busybox Container Image</specification>
+    <specification>openSUSE Tumbleweed BCI openSUSE Tumbleweed BusyBox Container Image</specification>
   </description>
   <preferences>
     <type image="docker">
       <containerconfig
-          name="bci/bci-busybox"
+          name="opensuse/bci/bci-busybox"
           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.busybox">
-            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION% Busybox Container Image"/>
+            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI openSUSE Tumbleweed BusyBox"/>
-            <label name="org.opencontainers.image.description" value="Busybox based on the SLE Base Container Image."/>
+            <label name="org.opencontainers.image.description" value="openSUSE Tumbleweed BusyBox 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"/>
+            <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-busybox:%OS_VERSION_ID_SP%.%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-busybox:%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>
         <subcommand execute="/bin/sh"/>
-
-
       </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>

config.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 
@@ -16,7 +16,11 @@ if command -v rpm > /dev/null; then
     suseImportBuildKey
 fi
 
+
 sed -i 's|/bin/bash|/bin/sh|' /etc/passwd
+# Will be recreated by the next rpm(1) run as root user
+rm -v /usr/lib/sysimage/rpm/Index.db
+
 
 #=======================================
 # Clean up after zypper if it is present