From df10137b2a4ccd567e15fc4675e429005007eaff Mon Sep 17 00:00:00 2001 From: David Hummel <6109326+hummeltech@users.noreply.github.com> Date: Thu, 20 Jun 2024 16:53:12 -0700 Subject: [PATCH] And adjust Dockerfiles & docs --- CMakeLists.txt | 3 +++ docker/archlinux/Dockerfile | 6 ++---- docker/centos/stream/Dockerfile | 6 ++---- docker/centos/stream/Dockerfile.mapnik-latest | 6 ++---- docker/debian/Dockerfile | 6 ++---- docker/fedora/Dockerfile | 6 ++---- docker/opensuse/Dockerfile | 6 ++---- docker/ubuntu/Dockerfile | 6 ++---- docs/build/building_on_arch_linux.md | 6 ++---- docs/build/building_on_centos_stream.md | 6 ++---- docs/build/building_on_debian.md | 6 ++---- docs/build/building_on_fedora.md | 6 ++---- docs/build/building_on_macos.md | 1 - docs/build/building_on_opensuse.md | 6 ++---- docs/build/building_on_ubuntu.md | 6 ++---- 15 files changed, 29 insertions(+), 53 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a49fdb41..26969416 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,6 +156,9 @@ endif() if(NOT RENDERD_SOCKET MATCHES "^/") set(RENDERD_SOCKET "/${RENDERD_SOCKET}") endif() +if(NOT RENDERD_RUN_DIR MATCHES "^/") + set(RENDERD_RUN_DIR "/${RENDERD_RUN_DIR}") +endif() if(NOT RENDERD_TILE_DIR MATCHES "^/") set(RENDERD_TILE_DIR "/${RENDERD_TILE_DIR}") endif() diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile index 337e07e4..edf88d7d 100644 --- a/docker/archlinux/Dockerfile +++ b/docker/archlinux/Dockerfile @@ -33,10 +33,8 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_CXX_STANDARD:STRING=17 \ - -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ diff --git a/docker/centos/stream/Dockerfile b/docker/centos/stream/Dockerfile index ccb8ba44..bec749bd 100644 --- a/docker/centos/stream/Dockerfile +++ b/docker/centos/stream/Dockerfile @@ -127,10 +127,8 @@ 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:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ diff --git a/docker/centos/stream/Dockerfile.mapnik-latest b/docker/centos/stream/Dockerfile.mapnik-latest index c243cead..a311ab93 100644 --- a/docker/centos/stream/Dockerfile.mapnik-latest +++ b/docker/centos/stream/Dockerfile.mapnik-latest @@ -117,10 +117,8 @@ 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:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile index 41221ce6..4829726b 100644 --- a/docker/debian/Dockerfile +++ b/docker/debian/Dockerfile @@ -36,10 +36,8 @@ 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:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile index 9b2ca652..1726e628 100644 --- a/docker/fedora/Dockerfile +++ b/docker/fedora/Dockerfile @@ -31,10 +31,8 @@ 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:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ diff --git a/docker/opensuse/Dockerfile b/docker/opensuse/Dockerfile index 308ab476..fcf5419e 100644 --- a/docker/opensuse/Dockerfile +++ b/docker/opensuse/Dockerfile @@ -124,10 +124,8 @@ 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:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 92993821..870fa6e8 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -37,10 +37,8 @@ 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:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ diff --git a/docs/build/building_on_arch_linux.md b/docs/build/building_on_arch_linux.md index 5e05c5c7..78ac6cba 100644 --- a/docs/build/building_on_arch_linux.md +++ b/docs/build/building_on_arch_linux.md @@ -41,10 +41,8 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest diff --git a/docs/build/building_on_centos_stream.md b/docs/build/building_on_centos_stream.md index dfd98cbe..18e80c68 100644 --- a/docs/build/building_on_centos_stream.md +++ b/docs/build/building_on_centos_stream.md @@ -59,10 +59,8 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest diff --git a/docs/build/building_on_debian.md b/docs/build/building_on_debian.md index b7fc3fbd..518bfdeb 100644 --- a/docs/build/building_on_debian.md +++ b/docs/build/building_on_debian.md @@ -42,10 +42,8 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest diff --git a/docs/build/building_on_fedora.md b/docs/build/building_on_fedora.md index 843f2b07..20d9fe0d 100644 --- a/docs/build/building_on_fedora.md +++ b/docs/build/building_on_fedora.md @@ -39,10 +39,8 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest diff --git a/docs/build/building_on_macos.md b/docs/build/building_on_macos.md index 2bea92b8..459a06f9 100644 --- a/docs/build/building_on_macos.md +++ b/docs/build/building_on_macos.md @@ -42,7 +42,6 @@ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/var/run \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ -DENABLE_TESTS:BOOL=ON cmake --build . diff --git a/docs/build/building_on_opensuse.md b/docs/build/building_on_opensuse.md index efd1c4da..6526f4e8 100644 --- a/docs/build/building_on_opensuse.md +++ b/docs/build/building_on_opensuse.md @@ -58,10 +58,8 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest diff --git a/docs/build/building_on_ubuntu.md b/docs/build/building_on_ubuntu.md index fe640000..1c5105a7 100644 --- a/docs/build/building_on_ubuntu.md +++ b/docs/build/building_on_ubuntu.md @@ -42,10 +42,8 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_INSTALL_PREFIX:PATH=/ \ + -DCMAKE_INSTALL_RUNSTATEDIR:PATH=run \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest