From 644d81d33ec284059f56156ea18b728a708def91 Mon Sep 17 00:00:00 2001 From: Jacquin Antoine Date: Sun, 1 Mar 2026 00:29:50 +0100 Subject: [PATCH] refactor: rename RPM directories to generic el8/el9/el10 naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace rocky8/rocky9/almalinux10 with el8/el9/el10 - Rename Docker build stages: rpm-rocky* → rpm-el* - Update Makefile to use new directory structure - Update comments: 'Rocky Linux' → 'Enterprise Linux' - Simplify Docker volume mount path for RPM output This makes the naming more generic and aligned with RPM conventions (el8, el9, el10) rather than specific distribution names. Co-authored-by: Qwen-Coder --- Dockerfile.package | 38 +++++++++++++++++++------------------- Makefile | 22 +++++++++++----------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Dockerfile.package b/Dockerfile.package index ecfe6f1..470b886 100644 --- a/Dockerfile.package +++ b/Dockerfile.package @@ -31,9 +31,9 @@ RUN mkdir -p dist && \ ./cmd/logcorrelator # ============================================================================= -# Stage 2: RPM Package builder for Rocky Linux 8 +# Stage 2: RPM Package builder for Enterprise Linux 8 (el8) # ============================================================================= -FROM rockylinux:8 AS rpm-rocky8-builder +FROM rockylinux:8 AS rpm-el8-builder WORKDIR /package @@ -66,9 +66,9 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \ chmod 755 /tmp/pkgroot/var/log/logcorrelator && \ chmod 755 /tmp/pkgroot/var/run/logcorrelator -# Build RPM for Rocky Linux 8 +# Build RPM for Enterprise Linux 8 (el8) ARG VERSION=$(grep -m1 "^Version:" packaging/rpm/logcorrelator.spec | awk '{print $2}') -RUN mkdir -p /packages/rpm/rocky8 && \ +RUN mkdir -p /packages/rpm/el8 && \ fpm -s dir -t rpm \ -n logcorrelator \ -v "${VERSION}" \ @@ -84,7 +84,7 @@ RUN mkdir -p /packages/rpm/rocky8 && \ --after-install /tmp/scripts/post \ --before-remove /tmp/scripts/preun \ --after-remove /tmp/scripts/postun \ - -p /packages/rpm/rocky8/logcorrelator-${VERSION}-1.el8.x86_64.rpm \ + -p /packages/rpm/el8/logcorrelator-${VERSION}-1.el8.x86_64.rpm \ usr/bin/logcorrelator \ etc/logcorrelator/logcorrelator.yml \ usr/share/logcorrelator/logcorrelator.yml.example \ @@ -94,9 +94,9 @@ RUN mkdir -p /packages/rpm/rocky8 && \ etc/systemd/system/logcorrelator.service # ============================================================================= -# Stage 3: RPM Package builder for Rocky Linux 9 +# Stage 3: RPM Package builder for Enterprise Linux 9 (el9) # ============================================================================= -FROM rockylinux:9 AS rpm-rocky9-builder +FROM rockylinux:9 AS rpm-el9-builder WORKDIR /package @@ -129,9 +129,9 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \ chmod 755 /tmp/pkgroot/var/log/logcorrelator && \ chmod 755 /tmp/pkgroot/var/run/logcorrelator -# Build RPM for Rocky Linux 9 +# Build RPM for Enterprise Linux 9 (el9) ARG VERSION=$(grep -m1 "^Version:" packaging/rpm/logcorrelator.spec | awk '{print $2}') -RUN mkdir -p /packages/rpm/rocky9 && \ +RUN mkdir -p /packages/rpm/el9 && \ fpm -s dir -t rpm \ -n logcorrelator \ -v "${VERSION}" \ @@ -147,7 +147,7 @@ RUN mkdir -p /packages/rpm/rocky9 && \ --after-install /tmp/scripts/post \ --before-remove /tmp/scripts/preun \ --after-remove /tmp/scripts/postun \ - -p /packages/rpm/rocky9/logcorrelator-${VERSION}-1.el9.x86_64.rpm \ + -p /packages/rpm/el9/logcorrelator-${VERSION}-1.el9.x86_64.rpm \ usr/bin/logcorrelator \ etc/logcorrelator/logcorrelator.yml \ usr/share/logcorrelator/logcorrelator.yml.example \ @@ -157,9 +157,9 @@ RUN mkdir -p /packages/rpm/rocky9 && \ etc/systemd/system/logcorrelator.service # ============================================================================= -# Stage 4: RPM Package builder for AlmaLinux 10 +# Stage 4: RPM Package builder for Enterprise Linux 10 (el10) # ============================================================================= -FROM almalinux:10 AS rpm-almalinux10-builder +FROM almalinux:10 AS rpm-el10-builder WORKDIR /package @@ -192,9 +192,9 @@ RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \ chmod 755 /tmp/pkgroot/var/log/logcorrelator && \ chmod 755 /tmp/pkgroot/var/run/logcorrelator -# Build RPM for AlmaLinux 10 +# Build RPM for Enterprise Linux 10 (el10) ARG VERSION=$(grep -m1 "^Version:" packaging/rpm/logcorrelator.spec | awk '{print $2}') -RUN mkdir -p /packages/rpm/almalinux10 && \ +RUN mkdir -p /packages/rpm/el10 && \ fpm -s dir -t rpm \ -n logcorrelator \ -v "${VERSION}" \ @@ -210,7 +210,7 @@ RUN mkdir -p /packages/rpm/almalinux10 && \ --after-install /tmp/scripts/post \ --before-remove /tmp/scripts/preun \ --after-remove /tmp/scripts/postun \ - -p /packages/rpm/almalinux10/logcorrelator-${VERSION}-1.el10.x86_64.rpm \ + -p /packages/rpm/el10/logcorrelator-${VERSION}-1.el10.x86_64.rpm \ usr/bin/logcorrelator \ etc/logcorrelator/logcorrelator.yml \ usr/share/logcorrelator/logcorrelator.yml.example \ @@ -225,8 +225,8 @@ RUN mkdir -p /packages/rpm/almalinux10 && \ FROM alpine:latest AS output WORKDIR /packages -COPY --from=rpm-rocky8-builder /packages/rpm/rocky8/*.rpm /packages/rpm/rocky8/ -COPY --from=rpm-rocky9-builder /packages/rpm/rocky9/*.rpm /packages/rpm/rocky9/ -COPY --from=rpm-almalinux10-builder /packages/rpm/almalinux10/*.rpm /packages/rpm/almalinux10/ +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/ -CMD ["sh", "-c", "echo '=== RPM Rocky Linux 8 ===' && ls -la /packages/rpm/rocky8/ && echo '' && echo '=== RPM Rocky Linux 9 ===' && ls -la /packages/rpm/rocky9/ && echo '' && echo '=== RPM AlmaLinux 10 ===' && ls -la /packages/rpm/almalinux10/'"] +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/'"] diff --git a/Makefile b/Makefile index 894c7bc..2362cb9 100644 --- a/Makefile +++ b/Makefile @@ -52,22 +52,22 @@ package: package-rpm ## package-rpm: Build RPM packages for Rocky Linux 8/9, AlmaLinux 10 (requires Docker) package-rpm: - mkdir -p $(DIST_DIR)/rpm/rocky8 $(DIST_DIR)/rpm/rocky9 $(DIST_DIR)/rpm/almalinux10 + mkdir -p $(DIST_DIR)/rpm/el8 $(DIST_DIR)/rpm/el9 $(DIST_DIR)/rpm/el10 $(DOCKER_BUILD) --target output -t $(PACKAGER_IMAGE) \ --build-arg VERSION=$(PKG_VERSION) \ -f Dockerfile.package . @echo "Extracting RPM packages from Docker image..." - $(DOCKER_RUN) --rm -v $(PWD)/$(DIST_DIR):/output $(PACKAGER_IMAGE) sh -c \ - "cp -r /packages/rpm/rocky8 /output/rpm/ && \ - cp -r /packages/rpm/rocky9 /output/rpm/ && \ - cp -r /packages/rpm/almalinux10 /output/rpm/" + $(DOCKER_RUN) --rm -v $(PWD)/$(DIST_DIR)/rpm:/output/rpm $(PACKAGER_IMAGE) sh -c \ + "cp -r /packages/rpm/el8 /output/rpm/ && \ + cp -r /packages/rpm/el9 /output/rpm/ && \ + cp -r /packages/rpm/el10 /output/rpm/" @echo "RPM packages created:" - @echo " Rocky Linux 8:" - ls -la $(DIST_DIR)/rpm/rocky8/ 2>/dev/null || echo " (no packages)" - @echo " Rocky Linux 9:" - ls -la $(DIST_DIR)/rpm/rocky9/ 2>/dev/null || echo " (no packages)" - @echo " AlmaLinux 10:" - ls -la $(DIST_DIR)/rpm/almalinux10/ 2>/dev/null || echo " (no packages)" + @echo " Enterprise Linux 8 (el8):" + ls -la $(DIST_DIR)/rpm/el8/ 2>/dev/null || echo " (no packages)" + @echo " Enterprise Linux 9 (el9):" + ls -la $(DIST_DIR)/rpm/el9/ 2>/dev/null || echo " (no packages)" + @echo " Enterprise Linux 10 (el10):" + ls -la $(DIST_DIR)/rpm/el10/ 2>/dev/null || echo " (no packages)" ## test-package-rpm: Test RPM package installation in Docker test-package-rpm: package-rpm