refactor: remove Debian/DEB packaging, RPM-only support
- Remove all DEB packaging files (packaging/deb/*) - Update Dockerfile.package to build RPM packages only - Update build.sh to remove DEB build steps - Update architecture.yml to reflect RPM-only distribution - Update README.md installation instructions for RPM only - Change runtime image from distroless/base-debian12 to scratch - Clean up obsolete build artifacts in dist/ Supported distributions now: - CentOS 7 (el7) - Rocky Linux 8 (el8) - Rocky Linux 9 (el9) - Rocky Linux 10 (el10) Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
Jacquin Antoine
@ -1,6 +1,6 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
# =============================================================================
|
||||
# logcorrelator - Dockerfile de packaging unifié (DEB + RPM multi-distros)
|
||||
# logcorrelator - Dockerfile de build et packaging RPM multi-distros
|
||||
# =============================================================================
|
||||
|
||||
# =============================================================================
|
||||
@ -31,71 +31,7 @@ RUN mkdir -p dist && \
|
||||
./cmd/logcorrelator
|
||||
|
||||
# =============================================================================
|
||||
# Stage 2: DEB Package builder
|
||||
# =============================================================================
|
||||
FROM ruby:3.2-bookworm AS deb-package-builder
|
||||
|
||||
WORKDIR /package
|
||||
|
||||
# Install fpm and dependencies
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
rpm \
|
||||
dpkg-dev \
|
||||
fakeroot \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& gem install fpm -v 1.16.0
|
||||
|
||||
# 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
|
||||
|
||||
# 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/pkgroot/var/log/logcorrelator && \
|
||||
chmod 755 /tmp/pkgroot/var/run/logcorrelator
|
||||
|
||||
# Copy maintainer scripts
|
||||
COPY packaging/deb/postinst /tmp/scripts/postinst
|
||||
COPY packaging/deb/prerm /tmp/scripts/prerm
|
||||
COPY packaging/deb/postrm /tmp/scripts/postrm
|
||||
RUN chmod 755 /tmp/scripts/*
|
||||
|
||||
# Build DEB package
|
||||
ARG VERSION=1.0.0
|
||||
ARG ARCH=amd64
|
||||
RUN mkdir -p /packages/deb && \
|
||||
fpm -s dir -t deb \
|
||||
-n logcorrelator \
|
||||
-v "${VERSION}" \
|
||||
-C /tmp/pkgroot \
|
||||
--architecture "${ARCH}" \
|
||||
--description "Log correlation service for HTTP and network events" \
|
||||
--url "https://github.com/logcorrelator/logcorrelator" \
|
||||
--license "MIT" \
|
||||
--vendor "logcorrelator <dev@example.com>" \
|
||||
--maintainer "logcorrelator <dev@example.com>" \
|
||||
--depends "systemd" \
|
||||
--after-install /tmp/scripts/postinst \
|
||||
--before-remove /tmp/scripts/prerm \
|
||||
--after-remove /tmp/scripts/postrm \
|
||||
-p /packages/deb/logcorrelator_${VERSION}_${ARCH}.deb \
|
||||
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 3: RPM Package builder for CentOS 7
|
||||
# Stage 2: RPM Package builder for CentOS 7
|
||||
# =============================================================================
|
||||
FROM centos:7 AS rpm-centos7-builder
|
||||
|
||||
@ -155,7 +91,7 @@ RUN mkdir -p /packages/rpm/centos7 && \
|
||||
etc/systemd/system/logcorrelator.service
|
||||
|
||||
# =============================================================================
|
||||
# Stage 4: RPM Package builder for Rocky Linux 8
|
||||
# Stage 3: RPM Package builder for Rocky Linux 8
|
||||
# =============================================================================
|
||||
FROM rockylinux:8 AS rpm-rocky8-builder
|
||||
|
||||
@ -215,7 +151,7 @@ RUN mkdir -p /packages/rpm/rocky8 && \
|
||||
etc/systemd/system/logcorrelator.service
|
||||
|
||||
# =============================================================================
|
||||
# Stage 5: RPM Package builder for Rocky Linux 9
|
||||
# Stage 4: RPM Package builder for Rocky Linux 9
|
||||
# =============================================================================
|
||||
FROM rockylinux:9 AS rpm-rocky9-builder
|
||||
|
||||
@ -275,7 +211,7 @@ RUN mkdir -p /packages/rpm/rocky9 && \
|
||||
etc/systemd/system/logcorrelator.service
|
||||
|
||||
# =============================================================================
|
||||
# Stage 6: RPM Package builder for Rocky Linux 10
|
||||
# Stage 5: RPM Package builder for Rocky Linux 10
|
||||
# =============================================================================
|
||||
FROM rockylinux:10 AS rpm-rocky10-builder
|
||||
|
||||
@ -335,15 +271,14 @@ RUN mkdir -p /packages/rpm/rocky10 && \
|
||||
etc/systemd/system/logcorrelator.service
|
||||
|
||||
# =============================================================================
|
||||
# Stage 7: Output - Image finale avec tous les packages
|
||||
# Stage 6: Output - Image finale avec les packages RPM
|
||||
# =============================================================================
|
||||
FROM alpine:latest AS output
|
||||
|
||||
WORKDIR /packages
|
||||
COPY --from=deb-package-builder /packages/deb/*.deb /packages/deb/
|
||||
COPY --from=rpm-centos7-builder /packages/rpm/centos7/*.rpm /packages/rpm/centos7/
|
||||
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-rocky10-builder /packages/rpm/rocky10/*.rpm /packages/rpm/rocky10/
|
||||
|
||||
CMD ["sh", "-c", "echo '=== DEB Packages ===' && ls -la /packages/deb/ && echo '' && echo '=== RPM CentOS 7 ===' && ls -la /packages/rpm/centos7/ && echo '' && echo '=== RPM Rocky Linux 8 ===' && ls -la /packages/rpm/rocky8/ && echo '' && echo '=== RPM Rocky Linux 9 ===' && ls -la /packages/rpm/rocky9/ && echo '' && echo '=== RPM Rocky Linux 10 ===' && ls -la /packages/rpm/rocky10/"]
|
||||
CMD ["sh", "-c", "echo '=== RPM CentOS 7 ===' && ls -la /packages/rpm/centos7/ && echo '' && echo '=== RPM Rocky Linux 8 ===' && ls -la /packages/rpm/rocky8/ && echo '' && echo '=== RPM Rocky Linux 9 ===' && ls -la /packages/rpm/rocky9/ && echo '' && echo '=== RPM Rocky Linux 10 ===' && ls -la /packages/rpm/rocky10/'"]
|
||||
|
||||
Reference in New Issue
Block a user