From 68f0fcf810743e8a55c5e7f76cea87687e096657 Mon Sep 17 00:00:00 2001 From: toto Date: Tue, 3 Mar 2026 22:29:21 +0000 Subject: [PATCH] fix(rpm): copy RPMs from x86_64 subdirectory in output stage rpmbuild creates architecture-specific subdirectories (x86_64/) by default. Updated COPY commands to include this path. Co-authored-by: Qwen-Coder --- Dockerfile.package | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile.package b/Dockerfile.package index ab99a2f..5c25f7d 100644 --- a/Dockerfile.package +++ b/Dockerfile.package @@ -229,8 +229,11 @@ RUN /build-rpm.sh el10 ${VERSION} FROM alpine:latest AS output WORKDIR /packages -COPY --from=rpm-el8-builder /packages/rpm/el8/*.rpm /packages/rpm/el8/ -COPY --from=rpm-el9-builder /packages/rpm/el9/*.rpm /packages/rpm/el9/ -COPY --from=rpm-el10-builder /packages/rpm/el10/*.rpm /packages/rpm/el10/ + +# Copy RPMs from each builder stage +# rpmbuild creates x86_64 subdirectory by default +COPY --from=rpm-el8-builder /packages/rpm/el8/x86_64/*.rpm /packages/rpm/el8/ +COPY --from=rpm-el9-builder /packages/rpm/el9/x86_64/*.rpm /packages/rpm/el9/ +COPY --from=rpm-el10-builder /packages/rpm/el10/x86_64/*.rpm /packages/rpm/el10/ CMD ["sh", "-c", "echo '=== RPM Enterprise Linux 8 ===' && ls -la /packages/rpm/el8/ && echo '' && echo '=== RPM Enterprise Linux 9 ===' && ls -la /packages/rpm/el9/ && echo '' && echo '=== RPM Enterprise Linux 10 ===' && ls -la /packages/rpm/el10/'"]