Accepting request 1241385 from devel:BCI:Tumbleweed

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

OBS-URL: https://build.opensuse.org/request/show/1241385
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trivy-image?expand=0&rev=24

_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">trivy-image.kiwi</param>
     <param name="regex">%%trivy_version%%</param>
     <param name="package">trivy</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

trivy-image.changes

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

trivy-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/trivy:%%trivy_version%% opensuse/trivy:%%trivy_version%%-%RELEASE% opensuse/trivy:latest -->
+<!-- OBS-AddTag: opensuse/trivy:%%trivy_version%%-%RELEASE% opensuse/trivy:%%trivy_version%% opensuse/trivy:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="trivy-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,11 +27,10 @@ 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/trivy"
-          tag="%%trivy_version%%"
+          tag="%%trivy_version%%-%RELEASE%"
-          additionaltags="%%trivy_version%%-%RELEASE%,latest">
+          additionaltags="%%trivy_version%%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.application.trivy">
-            <label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed Container Vulnerability Scanner"/>
             <label name="org.opencontainers.image.description" value="Container Vulnerability Scanner container based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%%trivy_version%%"/>
@@ -51,7 +50,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
         <entrypoint execute="/usr/bin/trivy"/>
       </containerconfig>
     </type>
-    <version>2024</version>
+    <version>2025</version>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <rpm-excludedocs>true</rpm-excludedocs>