Skip to content

Commit ece2e08

Browse files
dirkmuellerdirkmueller
authored
Merge pull request #3018 from SUSE/for-deploy-Tumbleweed
🤖: Update build recipes for Tumbleweed
2 parents b34656f + de3ea3f commit ece2e08

9 files changed

Lines changed: 34 additions & 29 deletions

‎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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,43 @@
44
<service mode="buildtime" name="replace_using_package_version">
55
<param name="file">Dockerfile.apiserver</param>
66
<param name="regex">%%cdi_ver%%</param>
7-
<param name="package">containerized-data-importer-uploadproxy</param>
7+
<param name="package">obs-service-cdi_containers_meta</param>
88
<param name="parse-version">patch</param>
99
</service>
1010
<service mode="buildtime" name="replace_using_package_version">
1111
<param name="file">Dockerfile.cloner</param>
1212
<param name="regex">%%cdi_ver%%</param>
13-
<param name="package">containerized-data-importer-uploadproxy</param>
13+
<param name="package">obs-service-cdi_containers_meta</param>
1414
<param name="parse-version">patch</param>
1515
</service>
1616
<service mode="buildtime" name="replace_using_package_version">
1717
<param name="file">Dockerfile.controller</param>
1818
<param name="regex">%%cdi_ver%%</param>
19-
<param name="package">containerized-data-importer-uploadproxy</param>
19+
<param name="package">obs-service-cdi_containers_meta</param>
2020
<param name="parse-version">patch</param>
2121
</service>
2222
<service mode="buildtime" name="replace_using_package_version">
2323
<param name="file">Dockerfile.importer</param>
2424
<param name="regex">%%cdi_ver%%</param>
25-
<param name="package">containerized-data-importer-uploadproxy</param>
25+
<param name="package">obs-service-cdi_containers_meta</param>
2626
<param name="parse-version">patch</param>
2727
</service>
2828
<service mode="buildtime" name="replace_using_package_version">
2929
<param name="file">Dockerfile.operator</param>
3030
<param name="regex">%%cdi_ver%%</param>
31-
<param name="package">containerized-data-importer-uploadproxy</param>
31+
<param name="package">obs-service-cdi_containers_meta</param>
3232
<param name="parse-version">patch</param>
3333
</service>
3434
<service mode="buildtime" name="replace_using_package_version">
3535
<param name="file">Dockerfile.uploadproxy</param>
3636
<param name="regex">%%cdi_ver%%</param>
37-
<param name="package">containerized-data-importer-uploadproxy</param>
37+
<param name="package">obs-service-cdi_containers_meta</param>
3838
<param name="parse-version">patch</param>
3939
</service>
4040
<service mode="buildtime" name="replace_using_package_version">
4141
<param name="file">Dockerfile.uploadserver</param>
4242
<param name="regex">%%cdi_ver%%</param>
43-
<param name="package">containerized-data-importer-uploadproxy</param>
43+
<param name="package">obs-service-cdi_containers_meta</param>
4444
<param name="parse-version">patch</param>
4545
</service>
46-
</services>rvices>
46+
</services>

‎cdi-image/cdi-image.changes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Mon Oct 6 20:57:58 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
3+
4+
- fixup service corruption
5+
16
-------------------------------------------------------------------
27
Mon Oct 06 11:39:25 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
38

0 commit comments

Comments
 (0)