diff --git a/Dockerfile.package b/Dockerfile.package index 3e2c648..55f139e 100644 --- a/Dockerfile.package +++ b/Dockerfile.package @@ -1,6 +1,7 @@ # syntax=docker/dockerfile:1 # ============================================================================= -# ja4sentinel - Dockerfile de packaging RPM (CentOS 7, Rocky 8/9/10, AlmaLinux) +# ja4sentinel - Dockerfile de packaging RPM (Rocky 8/9/10, AlmaLinux) +# CentOS 7 support removed - minimum Rocky Linux 8 # ============================================================================= # ============================================================================= @@ -87,34 +88,6 @@ RUN mkdir -p /tmp/pkgroot/var/lib/ja4sentinel && \ chmod 750 /tmp/pkgroot/etc/ja4sentinel && \ chmod 755 /tmp/scripts/* -# Build RPM for CentOS 7 (el7) -# Note: Requires libpcap at runtime -ARG VERSION=1.0.0 -RUN mkdir -p /packages/rpm/el7 && \ - fpm -s dir -t rpm \ - -n ja4sentinel \ - -v "${VERSION}" \ - -C /tmp/pkgroot \ - --architecture "x86_64" \ - --rpm-dist el7 \ - --description "JA4 TLS fingerprinting daemon for network monitoring" \ - --url "https://github.com/your-repo/ja4sentinel" \ - --license "MIT" \ - --vendor "JA4Sentinel Team " \ - --depends "systemd" \ - --depends "libpcap" \ - --after-install /tmp/scripts/postinst \ - --before-remove /tmp/scripts/prerm \ - --after-remove /tmp/scripts/postrm \ - -p /packages/rpm/el7/ja4sentinel-${VERSION}-1.el7.x86_64.rpm \ - usr/bin/ja4sentinel \ - usr/lib/systemd/system/ja4sentinel.service \ - etc/ja4sentinel/config.yml.default \ - usr/share/ja4sentinel/config.yml \ - var/lib/ja4sentinel \ - var/log/ja4sentinel \ - var/run/ja4sentinel - # Build RPM for Rocky Linux 8 (el8) # Note: Requires libpcap at runtime RUN mkdir -p /packages/rpm/el8 && \ @@ -202,9 +175,8 @@ RUN mkdir -p /packages/rpm/el10 && \ FROM alpine:latest AS output WORKDIR /packages -COPY --from=rpm-builder /packages/rpm/el7/*.rpm /packages/rpm/el7/ COPY --from=rpm-builder /packages/rpm/el8/*.rpm /packages/rpm/el8/ COPY --from=rpm-builder /packages/rpm/el9/*.rpm /packages/rpm/el9/ COPY --from=rpm-builder /packages/rpm/el10/*.rpm /packages/rpm/el10/ -CMD ["sh", "-c", "echo '=== RPM Packages (el7 - CentOS 7) ===' && ls -la /packages/rpm/el7/ && echo '' && echo '=== RPM Packages (el8 - Rocky 8) ===' && ls -la /packages/rpm/el8/ && echo '' && echo '=== RPM Packages (el9 - Rocky 9) ===' && ls -la /packages/rpm/el9/ && echo '' && echo '=== RPM Packages (el10 - Alma/Rocky 10) ===' && ls -la /packages/rpm/el10/"] +CMD ["sh", "-c", "echo '=== RPM Packages (el8 - Rocky 8) ===' && ls -la /packages/rpm/el8/ && echo '' && echo '=== RPM Packages (el9 - Rocky 9) ===' && ls -la /packages/rpm/el9/ && echo '' && echo '=== RPM Packages (el10 - Alma/Rocky 10) ===' && ls -la /packages/rpm/el10/"] diff --git a/Makefile b/Makefile index 4914d35..ba75f21 100644 --- a/Makefile +++ b/Makefile @@ -93,22 +93,19 @@ fmt: ## package: Build RPM packages for all target distributions package: package-rpm -## package-rpm: Build RPM packages for all target distributions (requires Docker) +## package-rpm: Build RPM packages for Rocky Linux 8/9/10, AlmaLinux (requires Docker) package-rpm: - mkdir -p build/rpm/el7 build/rpm/el8 build/rpm/el9 build/rpm/el10 - @echo "Building RPM packages for CentOS 7, Rocky Linux 8/9, AlmaLinux 10..." + mkdir -p build/rpm/el8 build/rpm/el9 build/rpm/el10 + @echo "Building RPM packages for Rocky Linux 8/9, AlmaLinux 10..." docker build --target output -t ja4sentinel-rpm-packager:latest \ --build-arg VERSION=$(PKG_VERSION) \ -f Dockerfile.package . @echo "Extracting RPM packages from Docker image..." @docker run --rm -v $(PWD)/build:/output ja4sentinel-rpm-packager:latest sh -c \ - 'cp -r /packages/rpm/el7 /output/rpm/ && \ - cp -r /packages/rpm/el8 /output/rpm/ && \ + '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 " CentOS 7 (el7):" - ls -la build/rpm/el7/ 2>/dev/null || echo " (no packages)" @echo " Rocky Linux 8 (el8):" ls -la build/rpm/el8/ 2>/dev/null || echo " (no packages)" @echo " Rocky Linux 9 (el9):" diff --git a/README.md b/README.md index a97d6b7..7fa1ed0 100644 --- a/README.md +++ b/README.md @@ -44,12 +44,12 @@ Outil Go pour capturer le trafic réseau sur un serveur Linux, extraire les hand ### Note sur libpcap -**Le binaire est compilé sur Rocky Linux 9** pour une compatibilité maximale avec toutes les distributions RHEL/CentOS/Rocky/AlmaLinux. +**Le binaire est compilé sur Rocky Linux 9** pour une compatibilité maximale avec toutes les distributions RHEL/Rocky/AlmaLinux. libpcap est requis à l'exécution et sera installé automatiquement par le gestionnaire de packages. ### Packages système -#### Rocky Linux / RHEL / CentOS / AlmaLinux (.rpm) +#### Rocky Linux / RHEL / AlmaLinux (.rpm) ```bash # Télécharger le package @@ -68,10 +68,9 @@ sudo systemctl status ja4sentinel #### Distributions supportées -- CentOS 7 - Rocky Linux 8, 9, 10 - AlmaLinux 8, 9, 10 -- RHEL 7, 8, 9, 10 +- RHEL 8, 9, 10 ## Configuration