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

refactor: rename RPM directories to generic el8/el9/el10 naming

Browse Source 
- 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 <qwen-coder@alibabacloud.com>
This commit is contained in:
Jacquin Antoine
2026-03-01 00:29:50 +01:00
parent b25dc24ed9
commit 644d81d33e
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Dockerfile.package
View File

@ -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/'"]