Accepting request 1241384 from devel:BCI:Tumbleweed

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

OBS-URL: https://build.opensuse.org/request/show/1241384
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/micro-image?expand=0&rev=33

README.md

@@ -19,14 +19,14 @@ dependencies and needs no further installation of packages.
 Example using a Go application:
 
 ```Dockerfile
-FROM registry.suse.com/bci/golang:stable as build
+FROM registry.opensuse.org/opensuse/bci/golang:stable as build
 
 WORKDIR /app
 
 RUN go install github.com/go-training/helloworld@latest
 
 # Create an image to bundle the app
-FROM registry.suse.com/bci/bci-micro:latest
+FROM registry.opensuse.org/opensuse/bci/bci-micro:latest
 
 COPY --from=build /go/bin/helloworld /usr/local/bin/helloworld
 

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
 
@@ -26,6 +26,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

micro-image.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Wed Jan  1 14:13:48 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
+
+- update copyright year
+
+-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------
+Fri Oct 11 15:00:03 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- switch to the more standard - separator also for OsContainers
+
+-------------------------------------------------------------------
+Sat Sep 28 08:15:08 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- fix registry references in READMEs
+
+-------------------------------------------------------------------
+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>
 

micro-image.kiwi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: MIT -->
-<!-- 
+<!--
-    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/bci/bci-micro:%OS_VERSION_ID_SP% opensuse/bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE% opensuse/bci/bci-micro:latest -->
+<!-- OBS-AddTag: opensuse/bci/bci-micro:%OS_VERSION_ID_SP%-%RELEASE% opensuse/bci/bci-micro:%OS_VERSION_ID_SP% opensuse/bci/bci-micro:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="micro-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,20 +27,19 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker">
       <containerconfig
           name="opensuse/bci/bci-micro"
-          tag="%OS_VERSION_ID_SP%"
+          tag="%OS_VERSION_ID_SP%-%RELEASE%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
+          additionaltags="%OS_VERSION_ID_SP%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.micro">
-            <label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI Micro"/>
             <label name="org.opencontainers.image.description" value="A micro environment for containers 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.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.opencontainers.image.ref.name" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
+            <label name="org.opencontainers.image.ref.name" value="%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.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-micro:%OS_VERSION_ID_SP%-%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"/>
@@ -50,7 +49,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
         </labels>
       </containerconfig>
     </type>
-    <version>2024</version>
+    <version>2025</version>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <rpm-excludedocs>true</rpm-excludedocs>