From: Vsevolod Stakhov Date: Thu, 23 Oct 2025 08:01:17 +0000 (+0100) Subject: [Fix] Use DESTDIR pattern to fix hardcoded paths in rspamd binaries X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1daf550ca9ecd92e7bd9531890fc5400a440057f;p=thirdparty%2Frspamd.git [Fix] Use DESTDIR pattern to fix hardcoded paths in rspamd binaries 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. --- diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 8183fdfe64..bb8340fd0f 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -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 diff --git a/test/integration/Dockerfile.local b/test/integration/Dockerfile.local index 0040db75fe..19ba644572 100644 --- a/test/integration/Dockerfile.local +++ b/test/integration/Dockerfile.local @@ -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 && \