Updated Docs/Dockerfiles/GitHub actions after switching CMake to relative install paths (#412)

2025-07-25 01:20:03 +00:00 · 2024-03-16 14:57:19 -07:00
parent 4f04956289
commit 13a198d06d
33 changed files with 110 additions and 45 deletions
--- a/docker/archlinux/Dockerfile
+++ b/docker/archlinux/Dockerfile
@ -32,14 +32,16 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
    cmake -B . -S /tmp/mod_tile_src \
        -DCMAKE_BUILD_TYPE:STRING=Release \
+        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
        -DENABLE_TESTS:BOOL=ON && \
    cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \
    export DESTDIR=/tmp/mod_tile && \
    ctest --output-on-failure && \
-    (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \
-    mv /tmp/mod_tile/var/run /tmp/mod_tile/run
-
+    (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip)

 # Runner
 FROM archlinux:latest as runner
--- a/docker/centos/7/Dockerfile
+++ b/docker/centos/7/Dockerfile
@ -117,13 +117,16 @@ RUN source /opt/rh/devtoolset-9/enable && \
    export CXXFLAGS="-I/usr/include/boost169" && \
    cmake3 -B . -S /tmp/mod_tile_src \
        -DCMAKE_BUILD_TYPE:STRING=Release \
+        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
        -DENABLE_TESTS:BOOL=ON && \
    cmake3 --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \
    export DESTDIR=/tmp/mod_tile && \
    ctest3 --output-on-failure && \
-    (cmake3 --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \
-    mv /tmp/mod_tile/var/run /tmp/mod_tile/run
+    (cmake3 --install . --strip || make DESTDIR=${DESTDIR} install/strip)

 # Runner
 FROM centos:centos7 as runner
--- a/docker/centos/stream/Dockerfile
+++ b/docker/centos/stream/Dockerfile
@ -132,13 +132,16 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
    cmake -B . -S /tmp/mod_tile_src \
        -DCMAKE_BUILD_TYPE:STRING=Release \
+        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
        -DENABLE_TESTS:BOOL=ON && \
    cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \
    export DESTDIR=/tmp/mod_tile && \
    ctest --output-on-failure && \
-    (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \
-    mv /tmp/mod_tile/var/run /tmp/mod_tile/run
+    (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip)

 # Runner
 FROM quay.io/centos/centos:stream${centos_stream_version} as runner
--- a/docker/centos/stream/Dockerfile.mapnik-latest
+++ b/docker/centos/stream/Dockerfile.mapnik-latest
@ -117,13 +117,16 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
    cmake -B . -S /tmp/mod_tile_src \
        -DCMAKE_BUILD_TYPE:STRING=Release \
        -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES:PATH=/usr/include/boost1.78 \
+        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
        -DENABLE_TESTS:BOOL=ON && \
    cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \
    export DESTDIR=/tmp/mod_tile && \
    ctest --output-on-failure && \
-    (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \
-    mv /tmp/mod_tile/var/run /tmp/mod_tile/run
+    (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip)

 # Runner
 FROM quay.io/centos/centos:stream${centos_stream_version} as runner
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@ -36,13 +36,16 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
    cmake -B . -S /tmp/mod_tile_src \
        -DCMAKE_BUILD_TYPE:STRING=Release \
+        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
        -DENABLE_TESTS:BOOL=ON && \
    cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \
    export DESTDIR=/tmp/mod_tile && \
    ctest --output-on-failure && \
-    (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \
-    mv /tmp/mod_tile/var/run /tmp/mod_tile/run
+    (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip)

 # Runner
 FROM debian:${debian_version} as runner
--- a/docker/fedora/Dockerfile
+++ b/docker/fedora/Dockerfile
@ -31,13 +31,16 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
    cmake -B . -S /tmp/mod_tile_src \
        -DCMAKE_BUILD_TYPE:STRING=Release \
+        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
        -DENABLE_TESTS:BOOL=ON && \
    cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \
    export DESTDIR=/tmp/mod_tile && \
    ctest --output-on-failure && \
-    (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \
-    mv /tmp/mod_tile/var/run /tmp/mod_tile/run
+    (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip)

 # Runner
 FROM fedora:${fedora_version} as runner
--- a/docker/opensuse/Dockerfile
+++ b/docker/opensuse/Dockerfile
@ -113,13 +113,16 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
    cmake -B . -S /tmp/mod_tile_src \
        -DCMAKE_BUILD_TYPE:STRING=Release \
+        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
        -DENABLE_TESTS:BOOL=ON && \
    cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \
    export DESTDIR=/tmp/mod_tile && \
    ctest --output-on-failure && \
-    (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \
-    mv /tmp/mod_tile/var/run /tmp/mod_tile/run
+    (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip)

 # Runner
 FROM opensuse/${opensuse_version} as runner
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@ -37,13 +37,16 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
    cmake -B . -S /tmp/mod_tile_src \
        -DCMAKE_BUILD_TYPE:STRING=Release \
+        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
        -DENABLE_TESTS:BOOL=ON && \
    cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \
    export DESTDIR=/tmp/mod_tile && \
    ctest --output-on-failure && \
-    (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \
-    mv /tmp/mod_tile/var/run /tmp/mod_tile/run
+    (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip)

 # Runner
 FROM ubuntu:${ubuntu_version} as runner