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

fix: correct RPM package paths in Dockerfile.package and Makefile

Browse Source 
- Create /tmp/packages/el{8,9,10} directories before building RPMs
- Copy RPMs to distribution-specific directories
- Update Makefile extraction path to match new structure

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
Jacquin Antoine
2026-03-01 00:41:59 +01:00
parent 2ac75364c2
commit fe43ca90a8
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile.package
View File

@ -127,6 +127,9 @@ RUN chmod 755 /tmp/pkgroot-el10/usr/lib64/httpd/modules/mod_reqin_log.so && \
# Build RPM packages for each distribution using rpmbuild # Build RPM packages for each distribution using rpmbuild
# ============================================================================= # =============================================================================
# Create packages directory
RUN mkdir -p /tmp/packages/el8 /tmp/packages/el9 /tmp/packages/el10
# Build for el8 # Build for el8
RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') && \ RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') && \
mkdir -p /tmp/pkgroot-el8-rpm/usr/lib64/httpd/modules /tmp/pkgroot-el8-rpm/etc/httpd/conf.d && \ mkdir -p /tmp/pkgroot-el8-rpm/usr/lib64/httpd/modules /tmp/pkgroot-el8-rpm/etc/httpd/conf.d && \
@ -136,7 +139,7 @@ RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') &
--define "_topdir /tmp/rpmbuild-el8" \ --define "_topdir /tmp/rpmbuild-el8" \
--define "_pkgroot /tmp/pkgroot-el8-rpm" \ --define "_pkgroot /tmp/pkgroot-el8-rpm" \
--define "dist .el8" && \ --define "dist .el8" && \
cp /tmp/rpmbuild-el8/RPMS/x86_64/*.rpm /tmp/packages/mod_reqin_log-${VERSION}-1.el8.x86_64.rpm cp /tmp/rpmbuild-el8/RPMS/x86_64/*.rpm /tmp/packages/el8/
# Build for el9 # Build for el9
RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') && \ RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') && \
@ -147,7 +150,7 @@ RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') &
--define "_topdir /tmp/rpmbuild-el9" \ --define "_topdir /tmp/rpmbuild-el9" \
--define "_pkgroot /tmp/pkgroot-el9-rpm" \ --define "_pkgroot /tmp/pkgroot-el9-rpm" \
--define "dist .el9" && \ --define "dist .el9" && \
cp /tmp/rpmbuild-el9/RPMS/x86_64/*.rpm /tmp/packages/mod_reqin_log-${VERSION}-1.el9.x86_64.rpm cp /tmp/rpmbuild-el9/RPMS/x86_64/*.rpm /tmp/packages/el9/
# Build for el10 # Build for el10
RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') && \ RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') && \
@ -158,7 +161,7 @@ RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') &
--define "_topdir /tmp/rpmbuild-el10" \ --define "_topdir /tmp/rpmbuild-el10" \
--define "_pkgroot /tmp/pkgroot-el10-rpm" \ --define "_pkgroot /tmp/pkgroot-el10-rpm" \
--define "dist .el10" && \ --define "dist .el10" && \
cp /tmp/rpmbuild-el10/RPMS/x86_64/*.rpm /tmp/packages/mod_reqin_log-${VERSION}-1.el10.x86_64.rpm cp /tmp/rpmbuild-el10/RPMS/x86_64/*.rpm /tmp/packages/el10/
# ============================================================================= # =============================================================================
# Stage 3: Output - Image finale avec les packages RPM # Stage 3: Output - Image finale avec les packages RPM
@ -166,8 +169,8 @@ RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') &
FROM alpine:latest AS output FROM alpine:latest AS output
WORKDIR /packages WORKDIR /packages
COPY --from=package-builder /tmp/packages/*.el8.*.rpm /packages/rpm/el8/ COPY --from=package-builder /tmp/packages/el8/*.rpm /packages/rpm/el8/
COPY --from=package-builder /tmp/packages/*.el9.*.rpm /packages/rpm/el9/ COPY --from=package-builder /tmp/packages/el9/*.rpm /packages/rpm/el9/
COPY --from=package-builder /tmp/packages/*.el10.*.rpm /packages/rpm/el10/ COPY --from=package-builder /tmp/packages/el10/*.rpm /packages/rpm/el10/
CMD ["sh", "-c", "echo '=== RPM Packages (el8) ===' && ls -la /packages/rpm/el8/ && echo '' && echo '=== RPM Packages (el9) ===' && ls -la /packages/rpm/el9/ && echo '' && echo '=== RPM Packages (el10) ===' && ls -la /packages/rpm/el10/"] CMD ["sh", "-c", "echo '=== RPM Packages (el8) ===' && ls -la /packages/rpm/el8/ && echo '' && echo '=== RPM Packages (el9) ===' && ls -la /packages/rpm/el9/ && echo '' && echo '=== RPM Packages (el10) ===' && ls -la /packages/rpm/el10/"]

4
Makefile
View File

@ -92,8 +92,8 @@ package:
--build-arg VERSION=$(VERSION) \ --build-arg VERSION=$(VERSION) \
-f Dockerfile.package . -f Dockerfile.package .
@echo "Extracting packages from Docker image..." @echo "Extracting packages from Docker image..."
docker run --rm -v $(PWD)/$(DIST_DIR)/rpm:/output/rpm mod_reqin_log:packager \ docker run --rm -v $(PWD)/$(DIST_DIR)/rpm:/output mod_reqin_log:packager \
sh -c 'cp -r /packages/rpm/el8 /output/rpm/ && cp -r /packages/rpm/el9 /output/rpm/ && cp -r /packages/rpm/el10 /output/rpm/' sh -c 'cp -r /packages/rpm/el8 /output/ && cp -r /packages/rpm/el9 /output/ && cp -r /packages/rpm/el10 /output/'
@echo "Packages created:" @echo "Packages created:"
@echo " RPM (el8, el9, el10):" @echo " RPM (el8, el9, el10):"
@ls -la $(DIST_DIR)/rpm/el8/ @ls -la $(DIST_DIR)/rpm/el8/