diff --git a/Dockerfile.package b/Dockerfile.package index 8700a8f..8ea0efe 100644 --- a/Dockerfile.package +++ b/Dockerfile.package @@ -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 # ============================================================================= +# Create packages directory +RUN mkdir -p /tmp/packages/el8 /tmp/packages/el9 /tmp/packages/el10 + # Build for el8 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 && \ @@ -136,7 +139,7 @@ RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') & --define "_topdir /tmp/rpmbuild-el8" \ --define "_pkgroot /tmp/pkgroot-el8-rpm" \ --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 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 "_pkgroot /tmp/pkgroot-el9-rpm" \ --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 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 "_pkgroot /tmp/pkgroot-el10-rpm" \ --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 @@ -166,8 +169,8 @@ RUN VERSION=$(grep "^Version:" /package/mod_reqin_log.spec | awk '{print $2}') & FROM alpine:latest AS output WORKDIR /packages -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/*.el10.*.rpm /packages/rpm/el10/ +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/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/"] diff --git a/Makefile b/Makefile index 1f58570..7f01e74 100644 --- a/Makefile +++ b/Makefile @@ -92,8 +92,8 @@ package: --build-arg VERSION=$(VERSION) \ -f Dockerfile.package . @echo "Extracting packages from Docker image..." - docker run --rm -v $(PWD)/$(DIST_DIR)/rpm:/output/rpm 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/' + docker run --rm -v $(PWD)/$(DIST_DIR)/rpm:/output mod_reqin_log:packager \ + sh -c 'cp -r /packages/rpm/el8 /output/ && cp -r /packages/rpm/el9 /output/ && cp -r /packages/rpm/el10 /output/' @echo "Packages created:" @echo " RPM (el8, el9, el10):" @ls -la $(DIST_DIR)/rpm/el8/