Skip to content

Commit 5ce83c3

Browse files
author
SUSE Update Bot
committed
Test build for #1815 
1 parent 3e57fb7 commit 5ce83c3

17 files changed

Lines changed: 48 additions & 37 deletions

File tree

‎busybox-image/_service‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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>

‎nodejs-18-image/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@
1515

1616
#!UseOBSRepositories
1717

18+
#!BuildTag: bci/nodejs:%%nodejs_version%%-%RELEASE%
19+
#!BuildTag: bci/nodejs:%%nodejs_version%%
1820
#!BuildTag: bci/nodejs:18-%RELEASE%
1921
#!BuildTag: bci/nodejs:18
20-
#!BuildTag: bci/nodejs:%%nodejs_version%%
22+
#!BuildTag: bci/node:%%nodejs_version%%-%RELEASE%
23+
#!BuildTag: bci/node:%%nodejs_version%%
2124
#!BuildTag: bci/node:18-%RELEASE%
2225
#!BuildTag: bci/node:18
23-
#!BuildTag: bci/node:%%nodejs_version%%
2426
#!BuildName: bci-nodejs-18
2527
#!BuildVersion: 15.5.18
2628
FROM registry.suse.com/bci/bci-base:15.5
@@ -40,8 +42,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
4042
LABEL org.opencontainers.image.created="%BUILDTIME%"
4143
LABEL org.opencontainers.image.vendor="SUSE LLC"
4244
LABEL org.opencontainers.image.source="%SOURCEURL%"
43-
LABEL org.opencontainers.image.ref.name="18-%RELEASE%"
44-
LABEL org.opensuse.reference="registry.suse.com/bci/nodejs:18-%RELEASE%"
45+
LABEL org.opencontainers.image.ref.name="%%nodejs_version%%-%RELEASE%"
46+
LABEL org.opensuse.reference="registry.suse.com/bci/nodejs:%%nodejs_version%%-%RELEASE%"
4547
LABEL org.openbuildservice.disturl="%DISTURL%"
4648
LABEL com.suse.supportlevel="l3"
4749
LABEL com.suse.supportlevel.until="2024-12-31"

‎nodejs-18-image/_service‎

Lines changed: 2 additions & 2 deletions
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-11-devel-image/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
#!UseOBSRepositories
1717
#!ExclusiveArch: aarch64 x86_64 ppc64le s390x
18+
#!BuildTag: bci/openjdk-devel:%%java_version%%-%RELEASE%
19+
#!BuildTag: bci/openjdk-devel:%%java_version%%
1820
#!BuildTag: bci/openjdk-devel:11-%RELEASE%
1921
#!BuildTag: bci/openjdk-devel:11
2022
#!BuildName: bci-openjdk-devel-11
@@ -36,8 +38,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
3638
LABEL org.opencontainers.image.created="%BUILDTIME%"
3739
LABEL org.opencontainers.image.vendor="SUSE LLC"
3840
LABEL org.opencontainers.image.source="%SOURCEURL%"
39-
LABEL org.opencontainers.image.ref.name="11-%RELEASE%"
40-
LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:11-%RELEASE%"
41+
LABEL org.opencontainers.image.ref.name="%%java_version%%-%RELEASE%"
42+
LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:%%java_version%%-%RELEASE%"
4143
LABEL org.openbuildservice.disturl="%DISTURL%"
4244
LABEL com.suse.supportlevel="l3"
4345
LABEL com.suse.eula="sle-bci"

‎openjdk-11-devel-image/_service‎

Lines changed: 2 additions & 2 deletions
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-11-image/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
#!UseOBSRepositories
1717
#!ExclusiveArch: aarch64 x86_64 ppc64le s390x
18+
#!BuildTag: bci/openjdk:%%java_version%%-%RELEASE%
19+
#!BuildTag: bci/openjdk:%%java_version%%
1820
#!BuildTag: bci/openjdk:11-%RELEASE%
1921
#!BuildTag: bci/openjdk:11
2022
#!BuildName: bci-openjdk-11
@@ -36,8 +38,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
3638
LABEL org.opencontainers.image.created="%BUILDTIME%"
3739
LABEL org.opencontainers.image.vendor="SUSE LLC"
3840
LABEL org.opencontainers.image.source="%SOURCEURL%"
39-
LABEL org.opencontainers.image.ref.name="11-%RELEASE%"
40-
LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:11-%RELEASE%"
41+
LABEL org.opencontainers.image.ref.name="%%java_version%%-%RELEASE%"
42+
LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:%%java_version%%-%RELEASE%"
4143
LABEL org.openbuildservice.disturl="%DISTURL%"
4244
LABEL com.suse.supportlevel="l3"
4345
LABEL com.suse.eula="sle-bci"

‎openjdk-11-image/_service‎

Lines changed: 2 additions & 2 deletions
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>

0 commit comments

Comments
 (0)