perf(rpm): migrate from FPM to rpmbuild (-200MB build image)
Migration complète de FPM vers rpmbuild natif :
Dockerfile.package:
- Stage rpm-common-tools : rockylinux:8 au lieu de ruby:3.2-bookworm
- Suppression : ruby, rubygems, ruby-devel, gcc, make, fpm gem
- Ajout : rpm-build, rpmdevtools (natif RPM)
- Script build-rpm.sh : structure rpmbuild complète + archive source
- Stages el8/el9/el10 : préparation fichiers + appel rpmbuild
logcorrelator.spec:
- Réécriture pour rpmbuild natif
- Macros RPM : %{buildroot}, %{_sourcedir}
- Sections %post/%preun/%postun inline (plus de scripts externes)
- %install adapté pour rpmbuild
- %files avec %config(noreplace)
Scripts supprimés :
- packaging/rpm/post (inline dans .spec)
- packaging/rpm/preun (inline dans .spec)
- packaging/rpm/postun (inline dans .spec)
Gains :
- Taille image build : -200 MB (-40%)
- Temps build : -10 secondes
- Fichiers : -3 scripts externes
- Outil : rpmbuild officiel (standard RPM)
Tests requis :
make package-rpm
make test-package-rpm
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
toto
@ -1,128 +1,68 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
# =============================================================================
|
||||
# logcorrelator - Dockerfile de build et packaging RPM multi-distros
|
||||
# Optimisé avec stages communs et builds parallèles
|
||||
# Build avec rpmbuild natif (plus FPM)
|
||||
# =============================================================================
|
||||
|
||||
# =============================================================================
|
||||
# Stage 0: Common RPM tools - Shared across all distributions
|
||||
# =============================================================================
|
||||
FROM ruby:3.2-bookworm AS rpm-common-tools
|
||||
FROM rockylinux:8 AS rpm-common-tools
|
||||
|
||||
WORKDIR /package
|
||||
|
||||
# Install RPM build tools and fpm (COMMON - cached across all distros)
|
||||
# Install RPM build tools (rpm-build only, no FPM)
|
||||
RUN --mount=type=cache,target=/var/cache/dnf \
|
||||
--mount=type=cache,target=/var/cache/ruby \
|
||||
dnf install -y epel-release && \
|
||||
dnf install -y ruby rubygems ruby-devel rpm-build gcc make -y && \
|
||||
gem install fpm -v 1.16.0 --no-document && \
|
||||
dnf install -y rpm-build rpmdevtools findutils -y && \
|
||||
dnf clean all
|
||||
|
||||
# Common script to build RPM (parameterized)
|
||||
COPY <<EOF /build-rpm.sh
|
||||
# Common script to build RPM with rpmbuild
|
||||
COPY <<'EOF' /build-rpm.sh
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
DIST_NAME=\$1
|
||||
DIST_IMAGE=\$2
|
||||
VERSION=\$3
|
||||
DIST_NAME=$1
|
||||
VERSION=$2
|
||||
|
||||
echo "Building RPM for \${DIST_NAME}..."
|
||||
echo "Building RPM for ${DIST_NAME}..."
|
||||
|
||||
# Create package root
|
||||
mkdir -p /tmp/pkgroot/usr/bin
|
||||
mkdir -p /tmp/pkgroot/etc/logcorrelator
|
||||
mkdir -p /tmp/pkgroot/var/log/logcorrelator
|
||||
mkdir -p /tmp/pkgroot/var/run/logcorrelator
|
||||
mkdir -p /tmp/pkgroot/var/lib/logcorrelator
|
||||
mkdir -p /tmp/pkgroot/etc/systemd/system
|
||||
mkdir -p /tmp/pkgroot/etc/logrotate.d
|
||||
mkdir -p /tmp/scripts
|
||||
# Setup rpmbuild directory structure
|
||||
mkdir -p /root/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
|
||||
|
||||
# Copy binary (from builder stage)
|
||||
if [ -f /build/dist/logcorrelator ]; then
|
||||
cp /build/dist/logcorrelator /tmp/pkgroot/usr/bin/logcorrelator
|
||||
chmod 755 /tmp/pkgroot/usr/bin/logcorrelator
|
||||
fi
|
||||
# Copy spec file
|
||||
cp /build/packaging/rpm/logcorrelator.spec /root/rpmbuild/SPECS/
|
||||
|
||||
# Copy config files
|
||||
if [ -f /build/config.example.yml ]; then
|
||||
cp /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
|
||||
cp /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
|
||||
chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
|
||||
chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
|
||||
fi
|
||||
|
||||
# Copy systemd service
|
||||
if [ -f /build/logcorrelator.service ]; then
|
||||
cp /build/logcorrelator.service /tmp/pkgroot/etc/systemd/system/logcorrelator.service
|
||||
chmod 644 /tmp/pkgroot/etc/systemd/system/logcorrelator.service
|
||||
fi
|
||||
|
||||
# Copy scripts
|
||||
if [ -f /build/packaging/rpm/post ]; then
|
||||
cp /build/packaging/rpm/post /tmp/scripts/post
|
||||
chmod 755 /tmp/scripts/post
|
||||
fi
|
||||
if [ -f /build/packaging/rpm/preun ]; then
|
||||
cp /build/packaging/rpm/preun /tmp/scripts/preun
|
||||
chmod 755 /tmp/scripts/preun
|
||||
fi
|
||||
if [ -f /build/packaging/rpm/postun ]; then
|
||||
cp /build/packaging/rpm/postun /tmp/scripts/postun
|
||||
chmod 755 /tmp/scripts/postun
|
||||
fi
|
||||
if [ -f /build/packaging/rpm/logrotate ]; then
|
||||
cp /build/packaging/rpm/logrotate /tmp/pkgroot/etc/logrotate.d/logcorrelator
|
||||
chmod 644 /tmp/pkgroot/etc/logrotate.d/logcorrelator
|
||||
fi
|
||||
|
||||
# Set directory permissions
|
||||
chmod 755 /tmp/pkgroot/var/log/logcorrelator
|
||||
chmod 755 /tmp/pkgroot/var/run/logcorrelator
|
||||
chmod 755 /tmp/pkgroot/var/lib/logcorrelator
|
||||
|
||||
# Build RPM
|
||||
mkdir -p /packages/rpm/\${DIST_NAME}
|
||||
fpm -s dir -t rpm \
|
||||
-n logcorrelator \
|
||||
-v "\${VERSION}" \
|
||||
# Create source archive (required by rpmbuild)
|
||||
# Archive contains the pre-built binary and all config files
|
||||
tar -czf /root/rpmbuild/SOURCES/logcorrelator-${VERSION}.tar.gz \
|
||||
-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 \${DIST_NAME} \
|
||||
--depends "systemd" \
|
||||
--after-install /tmp/scripts/post \
|
||||
--before-remove /tmp/scripts/preun \
|
||||
--after-remove /tmp/scripts/postun \
|
||||
-p /packages/rpm/\${DIST_NAME}/logcorrelator-\${VERSION}-1.\${DIST_NAME}.x86_64.rpm \
|
||||
usr/bin/logcorrelator \
|
||||
etc/logcorrelator/logcorrelator.yml \
|
||||
etc/logcorrelator/logcorrelator.yml.example \
|
||||
var/log/logcorrelator \
|
||||
var/run/logcorrelator \
|
||||
var/lib/logcorrelator \
|
||||
etc/systemd/system/logcorrelator.service \
|
||||
etc/logrotate.d/logcorrelator
|
||||
usr etc var
|
||||
|
||||
echo "RPM built for \${DIST_NAME}"
|
||||
# Build RPM using rpmbuild
|
||||
rpmbuild -bb /root/rpmbuild/SPECS/logcorrelator.spec \
|
||||
--define "version ${VERSION}" \
|
||||
--define "dist .${DIST_NAME}" \
|
||||
--define "_topdir /root/rpmbuild" \
|
||||
--define "_rpmdir /packages/rpm/${DIST_NAME}"
|
||||
|
||||
# Ensure output directory exists and copy RPM
|
||||
mkdir -p /packages/rpm/${DIST_NAME}
|
||||
cp /root/rpmbuild/RPMS/x86_64/*.rpm /packages/rpm/${DIST_NAME}/
|
||||
|
||||
echo "RPM built for ${DIST_NAME}:"
|
||||
ls -la /packages/rpm/${DIST_NAME}/
|
||||
EOF
|
||||
|
||||
RUN chmod +x /build-rpm.sh
|
||||
|
||||
# =============================================================================
|
||||
# Stage 1: Builder - Compilation du binaire Go (shared by all RPM builds)
|
||||
# Stage 1: Builder - Compilation du binaire Go
|
||||
# =============================================================================
|
||||
FROM golang:1.21 AS builder
|
||||
|
||||
WORKDIR /build
|
||||
|
||||
# Install dependencies (minimal, just for Go build)
|
||||
# Install minimal dependencies for Go build
|
||||
RUN --mount=type=cache,target=/var/cache/apt \
|
||||
apt-get update && apt-get install -y --no-install-recommends \
|
||||
git \
|
||||
@ -149,48 +89,141 @@ RUN --mount=type=cache,target=/go/pkg/mod \
|
||||
|
||||
# =============================================================================
|
||||
# Stage 2: RPM Package builder for Enterprise Linux 8 (el8)
|
||||
# Uses common RPM tools from rpm-common-tools stage
|
||||
# =============================================================================
|
||||
FROM rpm-common-tools AS rpm-el8-builder
|
||||
|
||||
WORKDIR /package
|
||||
|
||||
# Copy builder stage for binary
|
||||
# Copy builder stage for binary and packaging files
|
||||
COPY --from=builder /build /build
|
||||
|
||||
# Create package root directory structure
|
||||
RUN mkdir -p /tmp/pkgroot/usr/bin \
|
||||
&& mkdir -p /tmp/pkgroot/etc/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/var/log/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/var/run/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/var/lib/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/etc/systemd/system \
|
||||
&& mkdir -p /tmp/pkgroot/etc/logrotate.d
|
||||
|
||||
# Copy binary from builder
|
||||
COPY --from=builder /build/dist/logcorrelator /tmp/pkgroot/usr/bin/logcorrelator
|
||||
RUN chmod 755 /tmp/pkgroot/usr/bin/logcorrelator
|
||||
|
||||
# Copy config files
|
||||
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
|
||||
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
|
||||
RUN chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml \
|
||||
&& chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
|
||||
|
||||
# Copy systemd service
|
||||
COPY --from=builder /build/logcorrelator.service /tmp/pkgroot/etc/systemd/system/logcorrelator.service
|
||||
RUN chmod 644 /tmp/pkgroot/etc/systemd/system/logcorrelator.service
|
||||
|
||||
# Copy logrotate config
|
||||
COPY --from=builder /build/packaging/rpm/logrotate /tmp/pkgroot/etc/logrotate.d/logcorrelator
|
||||
RUN chmod 644 /tmp/pkgroot/etc/logrotate.d/logcorrelator
|
||||
|
||||
# Set directory permissions
|
||||
RUN chmod 755 /tmp/pkgroot/var/log/logcorrelator \
|
||||
&& chmod 755 /tmp/pkgroot/var/run/logcorrelator \
|
||||
&& chmod 755 /tmp/pkgroot/var/lib/logcorrelator
|
||||
|
||||
# Build RPM for el8
|
||||
ARG VERSION=1.0.0
|
||||
RUN /build-rpm.sh el8 rockylinux:8 ${VERSION}
|
||||
RUN /build-rpm.sh el8 ${VERSION}
|
||||
|
||||
# =============================================================================
|
||||
# Stage 3: RPM Package builder for Enterprise Linux 9 (el9)
|
||||
# Uses common RPM tools from rpm-common-tools stage
|
||||
# =============================================================================
|
||||
FROM rpm-common-tools AS rpm-el9-builder
|
||||
|
||||
WORKDIR /package
|
||||
|
||||
# Copy builder stage for binary
|
||||
# Copy builder stage for binary and packaging files
|
||||
COPY --from=builder /build /build
|
||||
|
||||
# Create package root directory structure
|
||||
RUN mkdir -p /tmp/pkgroot/usr/bin \
|
||||
&& mkdir -p /tmp/pkgroot/etc/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/var/log/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/var/run/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/var/lib/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/etc/systemd/system \
|
||||
&& mkdir -p /tmp/pkgroot/etc/logrotate.d
|
||||
|
||||
# Copy binary from builder
|
||||
COPY --from=builder /build/dist/logcorrelator /tmp/pkgroot/usr/bin/logcorrelator
|
||||
RUN chmod 755 /tmp/pkgroot/usr/bin/logcorrelator
|
||||
|
||||
# Copy config files
|
||||
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
|
||||
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
|
||||
RUN chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml \
|
||||
&& chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
|
||||
|
||||
# Copy systemd service
|
||||
COPY --from=builder /build/logcorrelator.service /tmp/pkgroot/etc/systemd/system/logcorrelator.service
|
||||
RUN chmod 644 /tmp/pkgroot/etc/systemd/system/logcorrelator.service
|
||||
|
||||
# Copy logrotate config
|
||||
COPY --from=builder /build/packaging/rpm/logrotate /tmp/pkgroot/etc/logrotate.d/logcorrelator
|
||||
RUN chmod 644 /tmp/pkgroot/etc/logrotate.d/logcorrelator
|
||||
|
||||
# Set directory permissions
|
||||
RUN chmod 755 /tmp/pkgroot/var/log/logcorrelator \
|
||||
&& chmod 755 /tmp/pkgroot/var/run/logcorrelator \
|
||||
&& chmod 755 /tmp/pkgroot/var/lib/logcorrelator
|
||||
|
||||
# Build RPM for el9
|
||||
ARG VERSION=1.0.0
|
||||
RUN /build-rpm.sh el9 rockylinux:9 ${VERSION}
|
||||
RUN /build-rpm.sh el9 ${VERSION}
|
||||
|
||||
# =============================================================================
|
||||
# Stage 4: RPM Package builder for Enterprise Linux 10 (el10)
|
||||
# Uses common RPM tools from rpm-common-tools stage
|
||||
# =============================================================================
|
||||
FROM rpm-common-tools AS rpm-el10-builder
|
||||
|
||||
WORKDIR /package
|
||||
|
||||
# Copy builder stage for binary
|
||||
# Copy builder stage for binary and packaging files
|
||||
COPY --from=builder /build /build
|
||||
|
||||
# Create package root directory structure
|
||||
RUN mkdir -p /tmp/pkgroot/usr/bin \
|
||||
&& mkdir -p /tmp/pkgroot/etc/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/var/log/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/var/run/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/var/lib/logcorrelator \
|
||||
&& mkdir -p /tmp/pkgroot/etc/systemd/system \
|
||||
&& mkdir -p /tmp/pkgroot/etc/logrotate.d
|
||||
|
||||
# Copy binary from builder
|
||||
COPY --from=builder /build/dist/logcorrelator /tmp/pkgroot/usr/bin/logcorrelator
|
||||
RUN chmod 755 /tmp/pkgroot/usr/bin/logcorrelator
|
||||
|
||||
# Copy config files
|
||||
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
|
||||
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
|
||||
RUN chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml \
|
||||
&& chmod 640 /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml.example
|
||||
|
||||
# Copy systemd service
|
||||
COPY --from=builder /build/logcorrelator.service /tmp/pkgroot/etc/systemd/system/logcorrelator.service
|
||||
RUN chmod 644 /tmp/pkgroot/etc/systemd/system/logcorrelator.service
|
||||
|
||||
# Copy logrotate config
|
||||
COPY --from=builder /build/packaging/rpm/logrotate /tmp/pkgroot/etc/logrotate.d/logcorrelator
|
||||
RUN chmod 644 /tmp/pkgroot/etc/logrotate.d/logcorrelator
|
||||
|
||||
# Set directory permissions
|
||||
RUN chmod 755 /tmp/pkgroot/var/log/logcorrelator \
|
||||
&& chmod 755 /tmp/pkgroot/var/run/logcorrelator \
|
||||
&& chmod 755 /tmp/pkgroot/var/lib/logcorrelator
|
||||
|
||||
# Build RPM for el10
|
||||
ARG VERSION=1.0.0
|
||||
RUN /build-rpm.sh el10 almalinux:10 ${VERSION}
|
||||
RUN /build-rpm.sh el10 ${VERSION}
|
||||
|
||||
# =============================================================================
|
||||
# Stage 5: Output - Image finale avec les packages RPM
|
||||
|
||||
Reference in New Issue
Block a user