Skip to content

Commit 68c0d29

Browse files
author
SUSE Update Bot
committed
Test build for #3014 
1 parent d879784 commit 68c0d29

9 files changed

Lines changed: 32 additions & 30 deletions

‎cdi-image/Dockerfile.apiserver‎

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

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

‎cdi-image/Dockerfile.cloner‎

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

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

‎cdi-image/Dockerfile.controller‎

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

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

‎cdi-image/Dockerfile.importer‎

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

2828
RUN set -euo pipefail; \
2929
export PERMCTL_ALLOW_INSECURE_MODE_IF_NO_PROC=1; \
30-
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
31-
# sanity check that the version from the tag is equal to the version of containerized-data-importer-importer that we expect
30+
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
31+
# sanity check that the version from the tag is equal to the version of obs-service-cdi_containers_meta that we expect
3232
RUN set -euo pipefail; \
33-
[ "$(rpm --root /target -q --qf '%{version}' containerized-data-importer-importer | \
33+
[ "$(rpm --root /target -q --qf '%{version}' obs-service-cdi_containers_meta | \
3434
cut -d '.' -f -3)" = "1.60.1" ]
3535
RUN set -euo pipefail; useradd -u 1001 --create-home -s /bin/bash cdi-importer
3636

‎cdi-image/Dockerfile.operator‎

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

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

‎cdi-image/Dockerfile.uploadproxy‎

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

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

‎cdi-image/Dockerfile.uploadserver‎

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

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

‎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>

‎kubevirt-image/_service‎

Lines changed: 2 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"/>
@@ -49,4 +50,4 @@
4950
<param name="package">kubevirt</param>
5051
<param name="parse-version">patch</param>
5152
</service>
52-
</services>
53+
</services>

0 commit comments

Comments
 (0)