Skip to content

Commit 8101508

Browse files
author
SUSE Update Bot
committed
Test build for #3014 
1 parent b34656f commit 8101508

11 files changed

Lines changed: 61 additions & 32 deletions

File tree

‎apache-tomcat-10-image/_service‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" ?>
12
<services>
23
<service mode="buildtime" name="docker_label_helper"/>
34
<service mode="buildtime" name="kiwi_metainfo_helper"/>
@@ -16,4 +17,14 @@
1617
<param name="regex">%%tomcat_version%%</param>
1718
<param name="package">tomcat10</param>
1819
</service>
19-
</services>
20+
<service mode="buildtime" name="replace_using_package_version">
21+
<param name="file">Dockerfile.openjdk17</param>
22+
<param name="regex">%%tomcat_version%%</param>
23+
<param name="package">tomcat</param>
24+
</service>
25+
<service mode="buildtime" name="replace_using_package_version">
26+
<param name="file">Dockerfile.openjdk21</param>
27+
<param name="regex">%%tomcat_version%%</param>
28+
<param name="package">tomcat</param>
29+
</service>
30+
</services>

‎apache-tomcat-9-image/_service‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
1+
<?xml version="1.0" ?>
12
<services>
23
<service mode="buildtime" name="docker_label_helper"/>
34
<service mode="buildtime" name="kiwi_metainfo_helper"/>
5+
<service mode="buildtime" name="replace_using_package_version">
6+
<param name="file">Dockerfile.openjdk17</param>
7+
<param name="regex">%%tomcat_version%%</param>
8+
<param name="package">tomcat10</param>
9+
</service>
10+
<service mode="buildtime" name="replace_using_package_version">
11+
<param name="file">Dockerfile.openjdk21</param>
12+
<param name="regex">%%tomcat_version%%</param>
13+
<param name="package">tomcat10</param>
14+
</service>
15+
<service mode="buildtime" name="replace_using_package_version">
16+
<param name="file">Dockerfile.openjdk25</param>
17+
<param name="regex">%%tomcat_version%%</param>
18+
<param name="package">tomcat10</param>
19+
</service>
420
<service mode="buildtime" name="replace_using_package_version">
521
<param name="file">Dockerfile.openjdk17</param>
622
<param name="regex">%%tomcat_version%%</param>
@@ -11,4 +27,4 @@
1127
<param name="regex">%%tomcat_version%%</param>
1228
<param name="package">tomcat</param>
1329
</service>
14-
</services>
30+
</services>

‎cdi-image/Dockerfile.apiserver‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ COPY --from=target / /target
2626

2727
RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
29-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-api shadow
30-
# sanity check that the version from the tag is equal to the version of containerized-data-importer-apiserver that we expect
29+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-api obs-service-cdi_containers_meta shadow
30+
# sanity check that the version from the tag is equal to the version of obs-service-cdi_containers_meta that we expect
3131
RUN set -euo pipefail; \
32-
[ "$(rpm --root /target -q --qf '%{version}' containerized-data-importer-apiserver | \
32+
[ "$(rpm --root /target -q --qf '%{version}' obs-service-cdi_containers_meta | \
3333
cut -d '.' -f -3)" = "1.62.0" ]
3434
RUN set -euo pipefail; useradd -u 1001 --create-home -s /bin/bash cdi-apiserver
3535

‎cdi-image/Dockerfile.cloner‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ COPY --from=target / /target
2626

2727
RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
29-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-cloner curl shadow tar util-linux
30-
# sanity check that the version from the tag is equal to the version of containerized-data-importer-cloner that we expect
29+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-cloner curl obs-service-cdi_containers_meta shadow tar util-linux
30+
# sanity check that the version from the tag is equal to the version of obs-service-cdi_containers_meta that we expect
3131
RUN set -euo pipefail; \
32-
[ "$(rpm --root /target -q --qf '%{version}' containerized-data-importer-cloner | \
32+
[ "$(rpm --root /target -q --qf '%{version}' obs-service-cdi_containers_meta | \
3333
cut -d '.' -f -3)" = "1.62.0" ]
3434
RUN set -euo pipefail; useradd -u 1001 --create-home -s /bin/bash cdi-cloner
3535

‎cdi-image/Dockerfile.controller‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ COPY --from=target / /target
2626

2727
RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
29-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-controller shadow
30-
# sanity check that the version from the tag is equal to the version of containerized-data-importer-controller that we expect
29+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-controller obs-service-cdi_containers_meta shadow
30+
# sanity check that the version from the tag is equal to the version of obs-service-cdi_containers_meta that we expect
3131
RUN set -euo pipefail; \
32-
[ "$(rpm --root /target -q --qf '%{version}' containerized-data-importer-controller | \
32+
[ "$(rpm --root /target -q --qf '%{version}' obs-service-cdi_containers_meta | \
3333
cut -d '.' -f -3)" = "1.62.0" ]
3434
RUN set -euo pipefail; useradd -u 1001 --create-home -s /bin/bash cdi-controller
3535

‎cdi-image/Dockerfile.importer‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ COPY --from=target / /target
2626

2727
RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
29-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-importer curl nbdkit-basic-filters nbdkit-curl-plugin nbdkit-server nbdkit-xz-filter qemu-img shadow tar util-linux
30-
# sanity check that the version from the tag is equal to the version of containerized-data-importer-importer that we expect
29+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-importer curl nbdkit-basic-filters nbdkit-curl-plugin nbdkit-server nbdkit-xz-filter obs-service-cdi_containers_meta qemu-img shadow tar util-linux
30+
# sanity check that the version from the tag is equal to the version of obs-service-cdi_containers_meta that we expect
3131
RUN set -euo pipefail; \
32-
[ "$(rpm --root /target -q --qf '%{version}' containerized-data-importer-importer | \
32+
[ "$(rpm --root /target -q --qf '%{version}' obs-service-cdi_containers_meta | \
3333
cut -d '.' -f -3)" = "1.62.0" ]
3434
RUN set -euo pipefail; useradd -u 1001 --create-home -s /bin/bash cdi-importer
3535

‎cdi-image/Dockerfile.operator‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ COPY --from=target / /target
2626

2727
RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
29-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-operator shadow
30-
# sanity check that the version from the tag is equal to the version of containerized-data-importer-operator that we expect
29+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-operator obs-service-cdi_containers_meta shadow
30+
# sanity check that the version from the tag is equal to the version of obs-service-cdi_containers_meta that we expect
3131
RUN set -euo pipefail; \
32-
[ "$(rpm --root /target -q --qf '%{version}' containerized-data-importer-operator | \
32+
[ "$(rpm --root /target -q --qf '%{version}' obs-service-cdi_containers_meta | \
3333
cut -d '.' -f -3)" = "1.62.0" ]
3434
RUN set -euo pipefail; useradd -u 1001 --create-home -s /bin/bash cdi-operator
3535

‎cdi-image/Dockerfile.uploadproxy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ COPY --from=target / /target
2626

2727
RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
29-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-uploadproxy shadow
30-
# sanity check that the version from the tag is equal to the version of containerized-data-importer-uploadproxy that we expect
29+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-uploadproxy obs-service-cdi_containers_meta shadow
30+
# sanity check that the version from the tag is equal to the version of obs-service-cdi_containers_meta that we expect
3131
RUN set -euo pipefail; \
32-
[ "$(rpm --root /target -q --qf '%{version}' containerized-data-importer-uploadproxy | \
32+
[ "$(rpm --root /target -q --qf '%{version}' obs-service-cdi_containers_meta | \
3333
cut -d '.' -f -3)" = "1.62.0" ]
3434
RUN set -euo pipefail; useradd -u 1001 --create-home -s /bin/bash cdi-uploadproxy
3535

‎cdi-image/Dockerfile.uploadserver‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ COPY --from=target / /target
2626

2727
RUN set -euo pipefail; \
2828
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
29-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-uploadserver curl libnbd qemu-img shadow tar util-linux
30-
# sanity check that the version from the tag is equal to the version of containerized-data-importer-uploadserver that we expect
29+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends containerized-data-importer-uploadserver curl libnbd obs-service-cdi_containers_meta qemu-img shadow tar util-linux
30+
# sanity check that the version from the tag is equal to the version of obs-service-cdi_containers_meta that we expect
3131
RUN set -euo pipefail; \
32-
[ "$(rpm --root /target -q --qf '%{version}' containerized-data-importer-uploadserver | \
32+
[ "$(rpm --root /target -q --qf '%{version}' obs-service-cdi_containers_meta | \
3333
cut -d '.' -f -3)" = "1.62.0" ]
3434
RUN set -euo pipefail; useradd -u 1001 --create-home -s /bin/bash cdi-uploadserver
3535

‎cdi-image/_service‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,47 @@
1+
<?xml version="1.0" ?>
12
<services>
23
<service mode="buildtime" name="docker_label_helper"/>
34
<service mode="buildtime" name="kiwi_metainfo_helper"/>
45
<service mode="buildtime" name="replace_using_package_version">
56
<param name="file">Dockerfile.apiserver</param>
67
<param name="regex">%%cdi_ver%%</param>
7-
<param name="package">containerized-data-importer-uploadproxy</param>
8+
<param name="package">obs-service-cdi_containers_meta</param>
89
<param name="parse-version">patch</param>
910
</service>
1011
<service mode="buildtime" name="replace_using_package_version">
1112
<param name="file">Dockerfile.cloner</param>
1213
<param name="regex">%%cdi_ver%%</param>
13-
<param name="package">containerized-data-importer-uploadproxy</param>
14+
<param name="package">obs-service-cdi_containers_meta</param>
1415
<param name="parse-version">patch</param>
1516
</service>
1617
<service mode="buildtime" name="replace_using_package_version">
1718
<param name="file">Dockerfile.controller</param>
1819
<param name="regex">%%cdi_ver%%</param>
19-
<param name="package">containerized-data-importer-uploadproxy</param>
20+
<param name="package">obs-service-cdi_containers_meta</param>
2021
<param name="parse-version">patch</param>
2122
</service>
2223
<service mode="buildtime" name="replace_using_package_version">
2324
<param name="file">Dockerfile.importer</param>
2425
<param name="regex">%%cdi_ver%%</param>
25-
<param name="package">containerized-data-importer-uploadproxy</param>
26+
<param name="package">obs-service-cdi_containers_meta</param>
2627
<param name="parse-version">patch</param>
2728
</service>
2829
<service mode="buildtime" name="replace_using_package_version">
2930
<param name="file">Dockerfile.operator</param>
3031
<param name="regex">%%cdi_ver%%</param>
31-
<param name="package">containerized-data-importer-uploadproxy</param>
32+
<param name="package">obs-service-cdi_containers_meta</param>
3233
<param name="parse-version">patch</param>
3334
</service>
3435
<service mode="buildtime" name="replace_using_package_version">
3536
<param name="file">Dockerfile.uploadproxy</param>
3637
<param name="regex">%%cdi_ver%%</param>
37-
<param name="package">containerized-data-importer-uploadproxy</param>
38+
<param name="package">obs-service-cdi_containers_meta</param>
3839
<param name="parse-version">patch</param>
3940
</service>
4041
<service mode="buildtime" name="replace_using_package_version">
4142
<param name="file">Dockerfile.uploadserver</param>
4243
<param name="regex">%%cdi_ver%%</param>
43-
<param name="package">containerized-data-importer-uploadproxy</param>
44+
<param name="package">obs-service-cdi_containers_meta</param>
4445
<param name="parse-version">patch</param>
4546
</service>
46-
</services>rvices>
47+
</services>

0 commit comments

Comments
 (0)