Accepting request 1247051 from devel:BCI:Tumbleweed

🤖: sync package with devel:BCI:Tumbleweed from OBS

OBS-URL: https://build.opensuse.org/request/show/1247051
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/distribution-image?expand=0&rev=30

README.md

@@ -31,7 +31,7 @@ Then you can start the container with the following command:
 
 ```bash
 podman run -d --restart=always -p 5000:5000 -v /path/to/config.yml:/etc/registry/config.yml \
-  -v /var/lib/docker-registry:/var/lib/docker-registry --name registry registry.opensuse.org/opensuse/registry:%%registry_version%%-%RELEASE%
+  -v /var/lib/docker-registry:/var/lib/docker-registry --name registry registry.opensuse.org/opensuse/registry:2.8
 ```
 
 The registry is available at `http://localhost:5000`. To keep the registry running after a reboot, create a systemd service as follows:

_service

@@ -1,7 +1,7 @@
 <services>
   <service mode="buildtime" name="kiwi_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
+  <service mode="buildtime" name="replace_using_package_version">
     <param name="file">distribution-image.kiwi</param>
     <param name="regex">%%registry_version%%</param>
     <param name="package">distribution-registry</param>

config.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022-2024 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2025 SUSE LLC
 
 set -euo pipefail
 
@@ -25,6 +25,6 @@ if command -v zypper > /dev/null; then
     zypper -n clean
 fi
 
-rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
+rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 exit 0

distribution-image.changes

@@ -1,3 +1,53 @@
+-------------------------------------------------------------------
+Wed Feb 19 11:33:09 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
+
+- fix image references in README
+
+-------------------------------------------------------------------
+Wed Jan  1 14:13:48 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
+
+- update copyright year
+
+-------------------------------------------------------------------
+Tue Dec  3 13:26:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
+-------------------------------------------------------------------
+Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- be explicit in protocol for expose statement
+
+-------------------------------------------------------------------
+Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- remove nonsensical org.opencontainers.image.authors - duplication of .vendor
+
+-------------------------------------------------------------------
+Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
+-------------------------------------------------------------------
+Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- improved log cleaning
+
+-------------------------------------------------------------------
+Fri Sep 13 09:56:19 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- Remove trailing whitespace
+
+-------------------------------------------------------------------
+Thu Aug  8 19:28:10 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- add oci.image.ref.name
+
+-------------------------------------------------------------------
+Thu Aug  8 16:43:43 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- remove oci reference annotation again
+
 -------------------------------------------------------------------
 Mon Aug  5 11:38:13 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 

distribution-image.kiwi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: Apache-2.0 -->
-<!-- 
-    Copyright (c) 2024 SUSE LLC
+<!--
+    Copyright (c) 2025 SUSE LLC
 
 All modifications and additions to the file contributed by third parties
 remain the property of their copyright owners, unless otherwise agreed
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: opensuse/registry:%%registry_version%% opensuse/registry:%%registry_version%%-%RELEASE% opensuse/registry:latest -->
+<!-- OBS-AddTag: opensuse/registry:%%registry_version%%-%RELEASE% opensuse/registry:%%registry_version%% opensuse/registry:2.8 opensuse/registry:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="registry-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,12 +27,11 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker" derived_from="obsrepositories:/opensuse/bci/bci-micro#latest">
       <containerconfig
           name="opensuse/registry"
-          tag="%%registry_version%%"
-          additionaltags="%%registry_version%%-%RELEASE%,latest"
+          tag="%%registry_version%%-%RELEASE%"
+          additionaltags="%%registry_version%%,2.8,latest"
           user="registry">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.application.registry">
-            <label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed OCI Container Registry (Distribution)"/>
             <label name="org.opencontainers.image.description" value="OCI Container Registry (Distribution) container based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%%registry_version%%"/>
@@ -40,12 +39,12 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
             <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.opencontainers.image.ref.name" value="%%registry_version%%-%RELEASE%"/>
             <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/registry:%%registry_version%%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="org.opensuse.release-stage" value="released"/>
             <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>
           </suse_label_helper:add_prefix>
-          <label name="org.opencontainers.image.revision" value="%DISTURL%"/>
           <label name="io.artifacthub.package.readme-url" value="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/distribution-image/README.md"/>
         </labels>
         <subcommand execute="serve">
@@ -57,11 +56,11 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
           <volume name="/var/lib/docker-registry" />
         </volumes>
         <expose>
-          <port number="5000" />
+          <port number="5000/tcp" />
         </expose>
       </containerconfig>
     </type>
-    <version>2024</version>
+    <version>2025</version>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <rpm-excludedocs>true</rpm-excludedocs>