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

feat: add AlmaLinux 10 RPM support

Browse Source 
- Add AlmaLinux 10 build stage using almalinux:10 Docker image
- Build RPM for AlmaLinux 10 (el10) alongside Rocky Linux 8/9
- Update build.sh to extract and document AlmaLinux 10 artifacts

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
Jacquin Antoine
2026-02-28 20:56:57 +01:00
parent 846f1aa6cd
commit 439e18c70d
2 changed files with 73 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Dockerfile.package
View File

@ -151,12 +151,73 @@ RUN mkdir -p /packages/rpm/rocky9 && \
etc/systemd/system/logcorrelator.service
# =============================================================================
# Stage 4: Output - Image finale avec les packages RPM
# Stage 4: RPM Package builder for AlmaLinux 10
# =============================================================================
FROM almalinux:10 AS rpm-almalinux10-builder
WORKDIR /package
# Install RPM build tools and fpm
RUN dnf install -y epel-release && \
dnf install -y ruby rubygems ruby-devel rpm-build gcc make && \
gem install fpm -v 1.16.0 --no-document && \
dnf clean all
# Copy binary from builder
COPY --from=builder /build/dist/logcorrelator /tmp/pkgroot/usr/bin/logcorrelator
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
COPY --from=builder /build/config.example.yml /tmp/pkgroot/usr/share/logcorrelator/logcorrelator.yml.example
COPY --from=builder /build/logcorrelator.service /tmp/pkgroot/etc/systemd/system/logcorrelator.service
COPY packaging/rpm/post /tmp/scripts/post
COPY packaging/rpm/preun /tmp/scripts/preun
COPY packaging/rpm/postun /tmp/scripts/postun
# Create directories and set permissions
RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \
mkdir -p /tmp/pkgroot/var/run/logcorrelator && \
mkdir -p /tmp/pkgroot/var/lib/logcorrelator && \
chmod 755 /tmp/pkgroot/usr/bin/logcorrelator && \
chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml && \
chmod 640 /tmp/pkgroot/usr/share/logcorrelator/logcorrelator.yml.example && \
chmod 644 /tmp/pkgroot/etc/systemd/system/logcorrelator.service && \
chmod 755 /tmp/scripts/* && \
chmod 755 /tmp/pkgroot/var/log/logcorrelator && \
chmod 755 /tmp/pkgroot/var/run/logcorrelator
# Build RPM for AlmaLinux 10
ARG VERSION=1.0.0
RUN mkdir -p /packages/rpm/almalinux10 && \
fpm -s dir -t rpm \
-n logcorrelator \
-v "${VERSION}" \
-C /tmp/pkgroot \
--architecture "x86_64" \
--rpm-os linux \
--description "Log correlation service for HTTP and network events" \
--url "https://github.com/logcorrelator/logcorrelator" \
--license "MIT" \
--vendor "logcorrelator <dev@example.com>" \
--rpm-dist el10 \
--depends "systemd" \
--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 \
usr/bin/logcorrelator \
etc/logcorrelator/logcorrelator.yml \
usr/share/logcorrelator/logcorrelator.yml.example \
var/log/logcorrelator \
var/run/logcorrelator \
etc/systemd/system/logcorrelator.service
# =============================================================================
# Stage 5: Output - Image finale avec les packages RPM
# =============================================================================
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/
CMD ["sh", "-c", "echo '=== RPM Rocky Linux 8 ===' && ls -la /packages/rpm/rocky8/ && echo '' && echo '=== RPM Rocky Linux 9 ===' && ls -la /packages/rpm/rocky9/'"]
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/'"]

14
build.sh
View File

@ -41,9 +41,9 @@ docker build \
# Extract packages from builder container
echo "[4/4] Extracting packages..."
mkdir -p "${OUTPUT_DIR}/rpm/rocky8" "${OUTPUT_DIR}/rpm/rocky9"
mkdir -p "${OUTPUT_DIR}/rpm/rocky8" "${OUTPUT_DIR}/rpm/rocky9" "${OUTPUT_DIR}/rpm/almalinux10"
docker run --rm -v "${OUTPUT_DIR}:/output" logcorrelator-packager:latest \
sh -c 'cp -r /packages/rpm/rocky8 /output/rpm/ && cp -r /packages/rpm/rocky9 /output/rpm/'
sh -c 'cp -r /packages/rpm/rocky8 /output/rpm/ && cp -r /packages/rpm/rocky9 /output/rpm/ && cp -r /packages/rpm/almalinux10 /output/rpm/'
echo ""
echo "=============================================="
@ -52,8 +52,9 @@ echo "=============================================="
echo ""
echo "Artifacts:"
echo " - Runtime image: logcorrelator:${VERSION}"
echo " - RPM Rocky 8: ${OUTPUT_DIR}/rpm/rocky8/logcorrelator-${VERSION}-1.el8.x86_64.rpm"
echo " - RPM Rocky 9: ${OUTPUT_DIR}/rpm/rocky9/logcorrelator-${VERSION}-1.el9.x86_64.rpm"
echo " - RPM Rocky 8: ${OUTPUT_DIR}/rpm/rocky8/logcorrelator-${VERSION}-1.el8.x86_64.rpm"
echo " - RPM Rocky 9: ${OUTPUT_DIR}/rpm/rocky9/logcorrelator-${VERSION}-1.el9.x86_64.rpm"
echo " - RPM AlmaLinux 10: ${OUTPUT_DIR}/rpm/almalinux10/logcorrelator-${VERSION}-1.el10.x86_64.rpm"
echo ""
echo "Usage:"
echo " # Run with Docker:"
@ -69,3 +70,8 @@ echo " sudo dnf install -y ${OUTPUT_DIR}/rpm/rocky9/logcorrelator-${VERSION}-1.
echo " sudo systemctl enable logcorrelator"
echo " sudo systemctl start logcorrelator"
echo ""
echo " # Install RPM on AlmaLinux 10:"
echo " sudo dnf install -y ${OUTPUT_DIR}/rpm/almalinux10/logcorrelator-${VERSION}-1.el10.x86_64.rpm"
echo " sudo systemctl enable logcorrelator"
echo " sudo systemctl start logcorrelator"
echo ""