Skip to content

Commit ae3cbed

Browse files
author
SUSE Update Bot
committed
Test build for #1815 
1 parent d142b35 commit ae3cbed

File tree

60 files changed

+116
-264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+116
-264
lines changed

‎.obs/workflows.yml

+7-14
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ staging_build:
99
source_project: home:defolos:BCI:CR:SLE-15-SP6
1010
source_package: alertmanager-image
1111
target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
12-
- branch_package:
13-
source_project: home:defolos:BCI:CR:SLE-15-SP6
14-
source_package: sac-apache-tomcat-10-image
15-
target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
16-
- branch_package:
17-
source_project: home:defolos:BCI:CR:SLE-15-SP6
18-
source_package: sac-apache-tomcat-10-image
19-
target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
2012
- branch_package:
2113
source_project: home:defolos:BCI:CR:SLE-15-SP6
2214
source_package: base-fips-image
@@ -197,6 +189,10 @@ staging_build:
197189
source_project: home:defolos:BCI:CR:SLE-15-SP6
198190
source_package: rust-stable-image
199191
target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
192+
- branch_package:
193+
source_project: home:defolos:BCI:CR:SLE-15-SP6
194+
source_package: sac-apache-tomcat-image
195+
target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
200196
- branch_package:
201197
source_project: home:defolos:BCI:CR:SLE-15-SP6
202198
source_package: sle15-kernel-module-devel-image
@@ -232,12 +228,6 @@ refresh_devel_BCI:
232228
- trigger_services:
233229
project: devel:BCI:SLE-15-SP6
234230
package: alertmanager-image
235-
- trigger_services:
236-
project: devel:BCI:SLE-15-SP6
237-
package: sac-apache-tomcat-10-image
238-
- trigger_services:
239-
project: devel:BCI:SLE-15-SP6
240-
package: sac-apache-tomcat-10-image
241231
- trigger_services:
242232
project: devel:BCI:SLE-15-SP6
243233
package: base-fips-image
@@ -373,6 +363,9 @@ refresh_devel_BCI:
373363
- trigger_services:
374364
project: devel:BCI:SLE-15-SP6
375365
package: rust-stable-image
366+
- trigger_services:
367+
project: devel:BCI:SLE-15-SP6
368+
package: sac-apache-tomcat-image
376369
- trigger_services:
377370
project: devel:BCI:SLE-15-SP6
378371
package: sle15-kernel-module-devel-image

‎389-ds-container/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%389ds_version%%</param>

‎alertmanager-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%alertmanager_minor_version%%</param>

‎aspnet-runtime-6.0/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎aspnet-runtime-8.0/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎base-fips-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎blackbox_exporter-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%blackbox_exporter_minor_version%%</param>

‎busybox-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="kiwi_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎distribution-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="kiwi_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">distribution-image.kiwi</param>
66
<param name="regex">%%registry_version%%</param>

‎dotnet-6.0/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎dotnet-8.0/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎dotnet-runtime-6.0/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎dotnet-runtime-8.0/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎gcc-13-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%gcc_minor_version%%</param>

‎gcc-7-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%gcc_minor_version%%</param>

‎git-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="kiwi_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">git-image.kiwi</param>
66
<param name="regex">%%git_version%%</param>

‎golang-oldstable-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%golang_version%%</param>

‎golang-oldstable-openssl-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%golang_version%%</param>

‎golang-stable-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%golang_version%%</param>

‎golang-stable-openssl-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%golang_version%%</param>

‎grafana-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%grafana_major_version%%</param>

‎helm-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="kiwi_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎init-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎kiwi-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎micro-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="kiwi_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎minimal-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="kiwi_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
</services>

‎nginx-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%nginx_version%%</param>

‎nodejs-20-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%nodejs_version%%</param>

‎openjdk-21-devel-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%java_version%%</param>

‎openjdk-21-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%java_version%%</param>

‎pcp-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%pcp_major%%</param>

‎php-apache8-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%composer_version%%</param>

‎php-fpm8-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%composer_version%%</param>

‎php8-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%composer_version%%</param>

‎postgres-16-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%pg_minor_version%%</param>

‎prometheus-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%prometheus_major_version%%</param>

‎python-3.11-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%py311_ver%%</param>

‎python-3.12-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%py312_ver%%</param>

‎python-3.6-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%py36_ver%%</param>

‎rmt-mariadb-client-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
66
<param name="regex">%%mariadb_version%%</param>

‎rmt-mariadb-image/_service

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<services>
2-
<service mode="buildtime" name="docker_label_helper"/>
3-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
2+
<service name="docker_label_helper" mode="buildtime" />
3+
<service name="kiwi_metainfo_helper" mode="buildtime" />
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">docker-entrypoint.sh</param>
66
<param name="regex">%%mariadb_version%%</param>

0 commit comments

Comments
 (0)