Test build for #1815

SUSE · Oct 14, 2024 · 7892dc3 · 7892dc3
1 parent 2352ccf
commit 7892dc3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 deletions.
diff --git a/base-image/_service b/base-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
diff --git a/busybox-image/_service b/busybox-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
diff --git a/init-image/_service b/init-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/kiwi:10.1.10-%RELEASE%
+#!BuildTag: bci/kiwi:10.1.10
 #!BuildTag: bci/kiwi:10-%RELEASE%
 #!BuildTag: bci/kiwi:10
 #!BuildTag: bci/kiwi:10.1
-#!BuildTag: bci/kiwi:10.1.10
 
 FROM bci/bci-base:16.0
 
@@ -37,8 +38,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/kiwi:10-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="10.1.10-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/kiwi:10.1.10-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"

diff --git a/kiwi-image/_service b/kiwi-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
diff --git a/micro-image/_service b/micro-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
diff --git a/minimal-image/_service b/minimal-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
diff --git a/sle16-kernel-module-devel-image/_service b/sle16-kernel-module-devel-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>