code_public/logcorrelator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(rpm): copy RPMs from x86_64 subdirectory in output stage
Some checks failed
Build and Test / test (push) Has been cancelled
Details
Build and Test / build (push) Has been cancelled
Details
Build and Test / docker (push) Has been cancelled
Details

Browse Source 
rpmbuild creates architecture-specific subdirectories (x86_64/)
by default. Updated COPY commands to include this path.

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
toto
2026-03-03 22:29:21 +00:00
parent 0c8be83173
commit 68f0fcf810
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile.package
View File

@ -229,8 +229,11 @@ RUN /build-rpm.sh el10 ${VERSION}
FROM alpine:latest AS output FROM alpine:latest AS output
WORKDIR /packages 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 RPMs from each builder stage
COPY --from=rpm-el10-builder /packages/rpm/el10/*.rpm /packages/rpm/el10/ # 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/'"] 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/'"]