]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Fix] Use DESTDIR pattern to fix hardcoded paths in rspamd binaries
authorVsevolod Stakhov <vsevolod@rspamd.com>
Thu, 23 Oct 2025 08:01:17 +0000 (09:01 +0100)
committerVsevolod Stakhov <vsevolod@rspamd.com>
Thu, 23 Oct 2025 08:34:36 +0000 (09:34 +0100)
Changed build to use CMAKE_INSTALL_PREFIX=/usr (final location) with
DESTDIR for staging. This ensures paths compiled into binaries match
runtime paths in Docker container, fixing lua_util module loading.

.github/workflows/integration-test.yml
test/integration/Dockerfile.local

index 8183fdfe64953956dc122731bbdfcd17f23da8bc..bb8340fd0f997342daaaa34dc2031b7ee4793cae 100644 (file)
@@ -66,13 +66,14 @@ jobs:
         run: |
           mkdir -p build install
           cd build
-          cmake -DCMAKE_INSTALL_PREFIX=../install \
+          cmake -DCMAKE_INSTALL_PREFIX=/usr \
+                -DCONFDIR=/etc/rspamd \
                 -DENABLE_COVERAGE=OFF \
                 -DENABLE_FULL_DEBUG=ON \
                 -DSANITIZE=address,leak \
                 -GNinja ..
           ninja
-          ninja install
+          DESTDIR="${GITHUB_WORKSPACE}/install" ninja install
 
       - name: Generate Fuzzy encryption keys
         working-directory: test/integration
index 0040db75fe174c396e4de581f08b7880498c4087..19ba644572c41c916abdb406504f5fba304ed102 100644 (file)
@@ -23,9 +23,7 @@ RUN apt-get update && apt-get install -y \
     libunwind8 \
     && rm -rf /var/lib/apt/lists/*
 
-COPY install/bin /usr/bin
-COPY install/lib /usr/lib
-COPY install/share /usr/share
+COPY install/usr /usr
 COPY install/etc /etc
 
 RUN mkdir -p /var/lib/rspamd /var/log/rspamd /var/run/rspamd && \