diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml index 6916080f..006aef43 100644 --- a/.github/workflows/docker-image-build.yml +++ b/.github/workflows/docker-image-build.yml @@ -9,9 +9,24 @@ on: - ".github/workflows/docker-image-build.yml" jobs: + dockerfile-lint: + name: Lint Dockerfiles + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Lint with hadolint + uses: hadolint/hadolint-action@v3.1.0 + with: + dockerfile: Dockerfile* + failure-threshold: warning + recursive: true + docker-image-build: continue-on-error: ${{ matrix.experimental || false }} name: Build & Test (${{ matrix.service-name }}) + needs: dockerfile-lint runs-on: ubuntu-latest strategy: matrix: diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile index 425e42bf..337f8003 100644 --- a/docker/archlinux/Dockerfile +++ b/docker/archlinux/Dockerfile @@ -1,12 +1,17 @@ +# hadolint global ignore=DL3025,DL3059 # Arguments +ARG archlinux_version=latest ARG runner_additional_packages # Builder -FROM archlinux:latest as builder +FROM archlinux:${archlinux_version} AS builder + +## Arguments +ARG archlinux_version ## Install builder dependencies -RUN --mount=id=archlinux:latest-/var/cache/pacman/pkg,sharing=locked,target=/var/cache/pacman/pkg,type=cache \ - --mount=id=archlinux:latest-/var/lib/pacman/sync,sharing=locked,target=/var/lib/pacman/sync,type=cache \ +RUN --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/cache/pacman/pkg,target=/var/cache/pacman/pkg \ + --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/lib/pacman/sync,target=/var/lib/pacman/sync \ pacman --sync --refresh --sysupgrade --noconfirm \ apache \ apr \ @@ -29,7 +34,7 @@ RUN --mount=id=archlinux:latest-/var/cache/pacman/pkg,sharing=locked,target=/var ## Build, Test & Install `mod_tile` COPY . /tmp/mod_tile_src WORKDIR /tmp/mod_tile_build -RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_CXX_STANDARD:STRING=17 \ @@ -39,20 +44,21 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . -RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ +RUN CTEST_PARALLEL_LEVEL="$(nproc)" && export CTEST_PARALLEL_LEVEL && \ ctest --output-on-failure RUN export DESTDIR=/tmp/mod_tile && \ cmake --install . --strip # Runner -FROM archlinux:latest as runner +FROM archlinux:${archlinux_version} AS runner ## Arguments +ARG archlinux_version ARG runner_additional_packages ## Install runner dependencies -RUN --mount=id=archlinux:latest-/var/cache/pacman/pkg,sharing=locked,target=/var/cache/pacman/pkg,type=cache \ - --mount=id=archlinux:latest-/var/lib/pacman/sync,sharing=locked,target=/var/lib/pacman/sync,type=cache \ +RUN --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/cache/pacman/pkg,target=/var/cache/pacman/pkg \ + --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/lib/pacman/sync,target=/var/lib/pacman/sync \ pacman --sync --refresh --sysupgrade --noconfirm ${runner_additional_packages} \ apache \ cairo \ diff --git a/docker/centos/stream/Dockerfile b/docker/centos/stream/Dockerfile index c129b7e6..d08a996a 100644 --- a/docker/centos/stream/Dockerfile +++ b/docker/centos/stream/Dockerfile @@ -1,10 +1,11 @@ +# hadolint global ignore=DL3025,DL3040,DL3041,DL3059 # Arguments ARG centos_stream_version=9 ARG extra_repository=crb ARG mapnik_version=4.0.0 # Mapnik Builder -FROM quay.io/centos/centos:stream${centos_stream_version} as mapnik-builder +FROM quay.io/centos/centos:stream${centos_stream_version} AS mapnik-builder ## Arguments ARG centos_stream_version @@ -12,7 +13,7 @@ ARG extra_repository ARG mapnik_version ## Install mapnik-builder dependencies -RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install "dnf-command(config-manager)" && \ @@ -43,14 +44,14 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/ ## Download, Build & Install `Mapnik` WORKDIR /tmp/mapnik_src -RUN --mount=id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src,type=cache \ +RUN --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src \ if [ ! -f CMakeLists.txt ]; then \ git clone --branch v${mapnik_version} --depth 1 --jobs 8 --recurse-submodules https://github.com/mapnik/mapnik.git /tmp/mapnik_src; \ fi WORKDIR /tmp/mapnik_build -RUN --mount=id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src,type=cache \ - --mount=id=centos:stream${centos_stream_version}-mapnik-build:${mapnik_version},target=/tmp/mapnik_build,type=cache \ - export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src \ + --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-build:${mapnik_version},target=/tmp/mapnik_build \ + CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ export DESTDIR=/tmp/mapnik && \ cmake -B . -S /tmp/mapnik_src \ -DBUILD_BENCHMARK:BOOL=OFF \ @@ -70,14 +71,14 @@ RUN --mount=id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version cmake --install . --strip # Builder -FROM quay.io/centos/centos:stream${centos_stream_version} as builder +FROM quay.io/centos/centos:stream${centos_stream_version} AS builder ## Arguments ARG centos_stream_version ARG extra_repository ## Install builder dependencies -RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install "dnf-command(config-manager)" && \ @@ -117,7 +118,7 @@ COPY --from=mapnik-builder /tmp/mapnik / ## Build, Test & Install `mod_tile` COPY . /tmp/mod_tile_src WORKDIR /tmp/mod_tile_build -RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ @@ -126,20 +127,20 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . -RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ +RUN CTEST_PARALLEL_LEVEL="$(nproc)" && export CTEST_PARALLEL_LEVEL && \ ctest --output-on-failure RUN export DESTDIR=/tmp/mod_tile && \ cmake --install . --strip # Runner -FROM quay.io/centos/centos:stream${centos_stream_version} as runner +FROM quay.io/centos/centos:stream${centos_stream_version} AS runner ## Arguments ARG centos_stream_version ARG extra_repository ## Install runner dependencies -RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install "dnf-command(config-manager)" && \ diff --git a/docker/centos/stream/Dockerfile.autotools b/docker/centos/stream/Dockerfile.autotools index e1702f11..08960d22 100644 --- a/docker/centos/stream/Dockerfile.autotools +++ b/docker/centos/stream/Dockerfile.autotools @@ -1,10 +1,11 @@ +# hadolint global ignore=DL3025,DL3040,DL3041,DL3059 # Arguments ARG centos_stream_version=9 ARG extra_repository=crb ARG mapnik_version=4.0.0 # Mapnik Builder -FROM quay.io/centos/centos:stream${centos_stream_version} as mapnik-builder +FROM quay.io/centos/centos:stream${centos_stream_version} AS mapnik-builder ## Arguments ARG centos_stream_version @@ -12,7 +13,7 @@ ARG extra_repository ARG mapnik_version ## Install mapnik-builder dependencies -RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install "dnf-command(config-manager)" && \ @@ -43,14 +44,14 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/ ## Download, Build & Install `Mapnik` WORKDIR /tmp/mapnik_src -RUN --mount=id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src,type=cache \ +RUN --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src \ if [ ! -f CMakeLists.txt ]; then \ git clone --branch v${mapnik_version} --depth 1 --jobs 8 --recurse-submodules https://github.com/mapnik/mapnik.git /tmp/mapnik_src; \ fi WORKDIR /tmp/mapnik_build -RUN --mount=id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src,type=cache \ - --mount=id=centos:stream${centos_stream_version}-mapnik-build:${mapnik_version},target=/tmp/mapnik_build,type=cache \ - export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src \ + --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-build:${mapnik_version},target=/tmp/mapnik_build \ + CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ export DESTDIR=/tmp/mapnik && \ cmake -B . -S /tmp/mapnik_src \ -DBUILD_BENCHMARK:BOOL=OFF \ @@ -70,14 +71,14 @@ RUN --mount=id=centos:stream${centos_stream_version}-mapnik-src:${mapnik_version cmake --install . --strip # Builder -FROM quay.io/centos/centos:stream${centos_stream_version} as builder +FROM quay.io/centos/centos:stream${centos_stream_version} AS builder ## Arguments ARG centos_stream_version ARG extra_repository ## Install builder dependencies -RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install "dnf-command(config-manager)" && \ @@ -121,14 +122,14 @@ RUN export DESTDIR=/tmp/mod_tile && \ RUN make test # Runner -FROM quay.io/centos/centos:stream${centos_stream_version} as runner +FROM quay.io/centos/centos:stream${centos_stream_version} AS runner ## Arguments ARG centos_stream_version ARG extra_repository ## Install runner dependencies -RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install "dnf-command(config-manager)" && \ @@ -162,13 +163,15 @@ COPY --from=builder \ /etc/httpd/conf.d/renderd-example-map.conf ## Fix mapnik directories +SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN sed \ --expression "s#/usr/lib/mapnik/3.1/input#$(find /usr -mindepth 1 -type d -name input | grep mapnik)#g" \ --expression "s#/usr/share/fonts/truetype#/usr/share/fonts#g" \ /usr/local/etc/renderd.conf > /etc/renderd.conf +SHELL ["/bin/sh", "-c"] ## Add configuration -RUN printf "LoadModule tile_module $(find /usr -name mod_tile.so)\n" > /etc/httpd/conf.modules.d/11-tile.conf +RUN printf "LoadModule tile_module %s\n" "$(find /usr -name mod_tile.so)" > /etc/httpd/conf.modules.d/11-tile.conf RUN printf '\n[example-map]\nMAXZOOM=20\nMINZOOM=0\nURI=/tiles/renderd-example\nXML=/usr/share/renderd/example-map/mapnik.xml\n' >> /etc/renderd.conf RUN printf '\n[example-map-jpg]\nMAXZOOM=20\nMINZOOM=0\nTYPE=jpg image/jpeg jpeg\nURI=/tiles/renderd-example-jpg\nXML=/usr/share/renderd/example-map/mapnik.xml\n' >> /etc/renderd.conf RUN printf '\n[example-map-png256]\nMAXZOOM=20\nMINZOOM=0\nTYPE=png image/png png256\nURI=/tiles/renderd-example-png256\nXML=/usr/share/renderd/example-map/mapnik.xml\n' >> /etc/renderd.conf diff --git a/docker/centos/stream/Dockerfile.mapnik-latest b/docker/centos/stream/Dockerfile.mapnik-latest index 72a17e78..04c14c34 100644 --- a/docker/centos/stream/Dockerfile.mapnik-latest +++ b/docker/centos/stream/Dockerfile.mapnik-latest @@ -1,16 +1,17 @@ +# hadolint global ignore=DL3025,DL3040,DL3041,DL3059 # Arguments ARG centos_stream_version=9 ARG extra_repository=crb # Mapnik Builder -FROM quay.io/centos/centos:stream${centos_stream_version} as mapnik-builder +FROM quay.io/centos/centos:stream${centos_stream_version} AS mapnik-builder ## Arguments ARG centos_stream_version ARG extra_repository ## Install mapnik-builder dependencies -RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install "dnf-command(config-manager)" && \ @@ -41,14 +42,14 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/ ## Download, Build & Install `Mapnik` WORKDIR /tmp/mapnik_src -RUN --mount=id=centos:stream${centos_stream_version}-mapnik-src:latest,target=/tmp/mapnik_src,type=cache \ +RUN --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-src:latest,target=/tmp/mapnik_src \ if [ ! -f CMakeLists.txt ]; then \ git clone --depth 1 --jobs 8 --recurse-submodules https://github.com/mapnik/mapnik.git /tmp/mapnik_src; \ fi WORKDIR /tmp/mapnik_build -RUN --mount=id=centos:stream${centos_stream_version}-mapnik-src:latest,target=/tmp/mapnik_src,type=cache \ - --mount=id=centos:stream${centos_stream_version}-mapnik-build:latest,target=/tmp/mapnik_build,type=cache \ - export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-src:latest,target=/tmp/mapnik_src \ + --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-build:latest,target=/tmp/mapnik_build \ + CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ export DESTDIR=/tmp/mapnik && \ cmake -B . -S /tmp/mapnik_src \ -DBUILD_BENCHMARK:BOOL=OFF \ @@ -68,14 +69,14 @@ RUN --mount=id=centos:stream${centos_stream_version}-mapnik-src:latest,target=/t cmake --install . --strip # Builder -FROM quay.io/centos/centos:stream${centos_stream_version} as builder +FROM quay.io/centos/centos:stream${centos_stream_version} AS builder ## Arguments ARG centos_stream_version ARG extra_repository ## Install builder dependencies -RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install "dnf-command(config-manager)" && \ @@ -115,7 +116,7 @@ COPY --from=mapnik-builder /tmp/mapnik / ## Build & Install `mod_tile` COPY . /tmp/mod_tile_src WORKDIR /tmp/mod_tile_build -RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ @@ -124,20 +125,20 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . -RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ +RUN CTEST_PARALLEL_LEVEL="$(nproc)" && export CTEST_PARALLEL_LEVEL && \ ctest --output-on-failure RUN export DESTDIR=/tmp/mod_tile && \ cmake --install . --strip # Runner -FROM quay.io/centos/centos:stream${centos_stream_version} as runner +FROM quay.io/centos/centos:stream${centos_stream_version} AS runner ## Arguments ARG centos_stream_version ARG extra_repository ## Install runner dependencies -RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install "dnf-command(config-manager)" && \ diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile index 2bbc7d78..e0cd40a3 100644 --- a/docker/debian/Dockerfile +++ b/docker/debian/Dockerfile @@ -1,17 +1,18 @@ +# hadolint global ignore=DL3008,DL3025,DL3059 # Arguments ARG debian_version=12 ARG libmapnik_version=3.1 ARG runner_additional_packages=libcurl4 libglib2.0 # Builder -FROM debian:${debian_version} as builder +FROM debian:${debian_version} AS builder ## Arguments ARG debian_version ## Install builder dependencies -RUN --mount=id=debian:${debian_version}-/var/cache/apt,sharing=locked,target=/var/cache/apt,type=cache \ - --mount=id=debian:${debian_version}-/var/lib/apt,sharing=locked,target=/var/lib/apt,type=cache \ +RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \ + --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \ export DEBIAN_FRONTEND=noninteractive && \ apt-get --yes update && \ apt-get --yes upgrade && \ @@ -34,7 +35,7 @@ RUN --mount=id=debian:${debian_version}-/var/cache/apt,sharing=locked,target=/va ## Build, Test & Install `mod_tile` COPY . /tmp/mod_tile_src WORKDIR /tmp/mod_tile_build -RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ @@ -43,13 +44,13 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . -RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ +RUN CTEST_PARALLEL_LEVEL="$(nproc)" && export CTEST_PARALLEL_LEVEL && \ ctest --output-on-failure RUN export DESTDIR=/tmp/mod_tile && \ cmake --install . --strip # Runner -FROM debian:${debian_version} as runner +FROM debian:${debian_version} AS runner ## Arguments ARG debian_version @@ -57,8 +58,8 @@ ARG libmapnik_version ARG runner_additional_packages ## Install runner dependencies -RUN --mount=id=debian:${debian_version}-/var/cache/apt,sharing=locked,target=/var/cache/apt,type=cache \ - --mount=id=debian:${debian_version}-/var/lib/apt,sharing=locked,target=/var/lib/apt,type=cache \ +RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \ + --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \ export DEBIAN_FRONTEND=noninteractive && \ apt-get --yes update && \ apt-get --yes upgrade && \ diff --git a/docker/debian/Dockerfile.autotools b/docker/debian/Dockerfile.autotools index 0c60ded0..3ba53eed 100644 --- a/docker/debian/Dockerfile.autotools +++ b/docker/debian/Dockerfile.autotools @@ -1,17 +1,18 @@ +# hadolint global ignore=DL3008,DL3025,DL3059 # Arguments ARG debian_version=12 ARG libmapnik_version=3.1 ARG runner_additional_packages=libcurl4 libglib2.0 # Builder -FROM debian:${debian_version} as builder +FROM debian:${debian_version} AS builder ## Arguments ARG debian_version ## Install builder dependencies -RUN --mount=id=debian:${debian_version}-/var/cache/apt,sharing=locked,target=/var/cache/apt,type=cache \ - --mount=id=debian:${debian_version}-/var/lib/apt,sharing=locked,target=/var/lib/apt,type=cache \ +RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \ + --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \ export DEBIAN_FRONTEND=noninteractive && \ apt-get --yes update && \ apt-get --yes upgrade && \ @@ -40,7 +41,7 @@ RUN export DESTDIR=/tmp/mod_tile && \ RUN make test # Runner -FROM debian:${debian_version} as runner +FROM debian:${debian_version} AS runner ## Arguments ARG debian_version @@ -48,8 +49,8 @@ ARG libmapnik_version ARG runner_additional_packages ## Install runner dependencies -RUN --mount=id=debian:${debian_version}-/var/cache/apt,sharing=locked,target=/var/cache/apt,type=cache \ - --mount=id=debian:${debian_version}-/var/lib/apt,sharing=locked,target=/var/lib/apt,type=cache \ +RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \ + --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \ export DEBIAN_FRONTEND=noninteractive && \ apt-get --yes update && \ apt-get --yes upgrade && \ @@ -72,13 +73,15 @@ COPY --from=builder \ /etc/apache2/sites-available/renderd-example-map.conf ## Fix mapnik directories +SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN sed \ --expression "s#/usr/lib/mapnik/3.1/input#$(find /usr -mindepth 1 -type d -name input | grep mapnik)#g" \ --expression "s#/usr/share/fonts/truetype#/usr/share/fonts#g" \ /usr/local/etc/renderd.conf > /etc/renderd.conf +SHELL ["/bin/sh", "-c"] ## Add configuration -RUN printf "LoadModule tile_module $(find /usr -name mod_tile.so)\n" > /etc/apache2/mods-available/tile.load +RUN printf "LoadModule tile_module %s\n" "$(find /usr -name mod_tile.so)" > /etc/apache2/mods-available/tile.load RUN printf '\n[example-map]\nMAXZOOM=20\nMINZOOM=0\nURI=/tiles/renderd-example\nXML=/usr/share/renderd/example-map/mapnik.xml\n' >> /etc/renderd.conf RUN printf '\n[example-map-jpg]\nMAXZOOM=20\nMINZOOM=0\nTYPE=jpg image/jpeg jpeg\nURI=/tiles/renderd-example-jpg\nXML=/usr/share/renderd/example-map/mapnik.xml\n' >> /etc/renderd.conf RUN printf '\n[example-map-png256]\nMAXZOOM=20\nMINZOOM=0\nTYPE=png image/png png256\nURI=/tiles/renderd-example-png256\nXML=/usr/share/renderd/example-map/mapnik.xml\n' >> /etc/renderd.conf diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 1f69963f..239bb234 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -77,6 +77,13 @@ services: centos_stream_version: "9" extra_repository: crb dockerfile: docker/centos/stream/Dockerfile.mapnik-latest + centos-stream-10-development: + <<: *service_defaults + build: + <<: *build_defaults_centos_stream + args: + centos_stream_version: "10-development" + extra_repository: crb debian-10: <<: *service_defaults build: @@ -198,13 +205,15 @@ services: args: boost_version: "1_75_0" gcc_version: "13" - opensuse_version: "leap:15" + opensuse_release: leap + opensuse_version: "15" opensuse-tumbleweed: <<: *service_defaults build: <<: *build_defaults_opensuse args: - opensuse_version: "tumbleweed" + opensuse_release: tumbleweed + opensuse_version: latest ubuntu-20.04: <<: *service_defaults build: diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile index f1312daa..f9845998 100644 --- a/docker/fedora/Dockerfile +++ b/docker/fedora/Dockerfile @@ -1,14 +1,15 @@ +# hadolint global ignore=DL3025,DL3040,DL3041,DL3059 # Arguments ARG fedora_version=40 # Builder -FROM fedora:${fedora_version} as builder +FROM fedora:${fedora_version} AS builder ## Arguments ARG fedora_version ## Install builder dependencies -RUN --mount=id=fedora:${fedora_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=fedora:${fedora_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install \ @@ -29,7 +30,7 @@ RUN --mount=id=fedora:${fedora_version}-/var/cache/dnf,target=/var/cache/dnf,typ ## Build, Test & Install `mod_tile` COPY . /tmp/mod_tile_src WORKDIR /tmp/mod_tile_build -RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ @@ -38,19 +39,19 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . -RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ +RUN CTEST_PARALLEL_LEVEL="$(nproc)" && export CTEST_PARALLEL_LEVEL && \ ctest --output-on-failure RUN export DESTDIR=/tmp/mod_tile && \ cmake --install . --strip # Runner -FROM fedora:${fedora_version} as runner +FROM fedora:${fedora_version} AS runner ## Arguments ARG fedora_version ## Install runner dependencies -RUN --mount=id=fedora:${fedora_version}-/var/cache/dnf,target=/var/cache/dnf,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=fedora:${fedora_version}-/var/cache/dnf,target=/var/cache/dnf \ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \ echo "keepcache=True" >> /etc/dnf/dnf.conf && \ dnf --assumeyes install \ diff --git a/docker/opensuse/Dockerfile b/docker/opensuse/Dockerfile index efe5563a..2148b8c4 100644 --- a/docker/opensuse/Dockerfile +++ b/docker/opensuse/Dockerfile @@ -1,20 +1,23 @@ +# hadolint global ignore=DL3025,DL3036,DL3037,DL3059 # Arguments ARG boost_version ARG gcc_version ARG mapnik_version=4.0.0 -ARG opensuse_version=leap:15 +ARG opensuse_release=leap +ARG opensuse_version=15 # Mapnik Builder -FROM opensuse/${opensuse_version} as mapnik-builder +FROM opensuse/${opensuse_release}:${opensuse_version} AS mapnik-builder ## Arguments ARG boost_version ARG gcc_version ARG mapnik_version +ARG opensuse_release ARG opensuse_version ## Install mapnik-builder dependencies -RUN --mount=id=opensuse/${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=opensuse/${opensuse_release}:${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp \ zypper modifyrepo --all --keep-packages && \ zypper --non-interactive update && \ zypper --non-interactive install \ @@ -46,14 +49,14 @@ RUN --mount=id=opensuse/${opensuse_version}-/var/cache/zypp,target=/var/cache/zy ## Download, Build & Install `Mapnik` WORKDIR /tmp/mapnik_src -RUN --mount=id=opensuse/${opensuse_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src,type=cache \ +RUN --mount=type=cache,id=opensuse/${opensuse_release}:${opensuse_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src \ if [ ! -f CMakeLists.txt ]; then \ git clone --branch v${mapnik_version} --depth 1 --jobs 8 --recurse-submodules https://github.com/mapnik/mapnik.git /tmp/mapnik_src; \ fi WORKDIR /tmp/mapnik_build -RUN --mount=id=opensuse/${opensuse_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src,type=cache \ - --mount=id=opensuse/${opensuse_version}-mapnik-build:${mapnik_version},target=/tmp/mapnik_build,type=cache \ - export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN --mount=type=cache,id=opensuse/${opensuse_release}:${opensuse_version}-mapnik-src:${mapnik_version},target=/tmp/mapnik_src \ + --mount=type=cache,id=opensuse/${opensuse_release}:${opensuse_version}-mapnik-build:${mapnik_version},target=/tmp/mapnik_build \ + CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ export DESTDIR=/tmp/mapnik && \ cmake -B . -S /tmp/mapnik_src \ -DBUILD_BENCHMARK:BOOL=OFF \ @@ -73,14 +76,15 @@ RUN --mount=id=opensuse/${opensuse_version}-mapnik-src:${mapnik_version},target= cmake --install . --strip # Builder -FROM opensuse/${opensuse_version} as builder +FROM opensuse/${opensuse_release}:${opensuse_version} AS builder ## Arguments ARG boost_version +ARG opensuse_release ARG opensuse_version ## Install builder dependencies -RUN --mount=id=opensuse/${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=opensuse/${opensuse_release}:${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp \ zypper modifyrepo --all --keep-packages && \ zypper --non-interactive update && \ zypper --non-interactive install \ @@ -116,7 +120,7 @@ RUN id nobody || useradd --home-dir / --no-create-home --shell /usr/sbin/nologin ## Build, Test & Install `mod_tile` COPY . /tmp/mod_tile_src WORKDIR /tmp/mod_tile_build -RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ @@ -125,20 +129,21 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . -RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ +RUN CTEST_PARALLEL_LEVEL="$(nproc)" && export CTEST_PARALLEL_LEVEL && \ ctest --output-on-failure RUN export DESTDIR=/tmp/mod_tile && \ cmake --install . --strip # Runner -FROM opensuse/${opensuse_version} as runner +FROM opensuse/${opensuse_release}:${opensuse_version} AS runner ## Arguments ARG boost_version +ARG opensuse_release ARG opensuse_version ## Install runner dependencies -RUN --mount=id=opensuse/${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp,type=cache,sharing=locked \ +RUN --mount=type=cache,sharing=locked,id=opensuse/${opensuse_release}:${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp \ zypper modifyrepo --all --keep-packages && \ zypper --non-interactive update && \ zypper --non-interactive install \ diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 47e01326..cb59006d 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -1,17 +1,18 @@ +# hadolint global ignore=DL3008,DL3025,DL3059 # Arguments ARG libmapnik_version=3.1 ARG runner_additional_packages ARG ubuntu_version=24.04 # Builder -FROM ubuntu:${ubuntu_version} as builder +FROM ubuntu:${ubuntu_version} AS builder ## Arguments ARG ubuntu_version ## Install builder dependencies -RUN --mount=id=ubuntu:${ubuntu_version}-/var/cache/apt,sharing=locked,target=/var/cache/apt,type=cache \ - --mount=id=ubuntu:${ubuntu_version}-/var/lib/apt,sharing=locked,target=/var/lib/apt,type=cache \ +RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \ + --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \ export DEBIAN_FRONTEND=noninteractive && \ apt-get --yes update && \ apt-get --yes upgrade && \ @@ -34,7 +35,7 @@ RUN --mount=id=ubuntu:${ubuntu_version}-/var/cache/apt,sharing=locked,target=/va ## Build, Test & Install `mod_tile` COPY . /tmp/mod_tile_src WORKDIR /tmp/mod_tile_build -RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ +RUN CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \ @@ -43,13 +44,13 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . -RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ +RUN CTEST_PARALLEL_LEVEL="$(nproc)" && export CTEST_PARALLEL_LEVEL && \ ctest --output-on-failure RUN export DESTDIR=/tmp/mod_tile && \ cmake --install . --strip # Runner -FROM ubuntu:${ubuntu_version} as runner +FROM ubuntu:${ubuntu_version} AS runner ## Arguments ARG libmapnik_version @@ -57,8 +58,8 @@ ARG runner_additional_packages ARG ubuntu_version ## Install runner dependencies -RUN --mount=id=ubuntu:${ubuntu_version}-/var/cache/apt,sharing=locked,target=/var/cache/apt,type=cache \ - --mount=id=ubuntu:${ubuntu_version}-/var/lib/apt,sharing=locked,target=/var/lib/apt,type=cache \ +RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \ + --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \ export DEBIAN_FRONTEND=noninteractive && \ apt-get --yes update && \ apt-get --yes upgrade && \ diff --git a/docker/ubuntu/Dockerfile.autotools b/docker/ubuntu/Dockerfile.autotools index 1b7c7f39..9d6bcbf2 100644 --- a/docker/ubuntu/Dockerfile.autotools +++ b/docker/ubuntu/Dockerfile.autotools @@ -1,16 +1,17 @@ +# hadolint global ignore=DL3008,DL3025,DL3059 # Arguments ARG libmapnik_version=3.1 ARG ubuntu_version=24.04 # Builder -FROM ubuntu:${ubuntu_version} as builder +FROM ubuntu:${ubuntu_version} AS builder ## Arguments ARG ubuntu_version ## Install builder dependencies -RUN --mount=id=ubuntu:${ubuntu_version}-/var/cache/apt,sharing=locked,target=/var/cache/apt,type=cache \ - --mount=id=ubuntu:${ubuntu_version}-/var/lib/apt,sharing=locked,target=/var/lib/apt,type=cache \ +RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \ + --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \ export DEBIAN_FRONTEND=noninteractive && \ apt-get --yes update && \ apt-get --yes upgrade && \ @@ -39,15 +40,15 @@ RUN export DESTDIR=/tmp/mod_tile && \ RUN make test # Runner -FROM ubuntu:${ubuntu_version} as runner +FROM ubuntu:${ubuntu_version} AS runner ## Arguments ARG libmapnik_version ARG ubuntu_version ## Install runner dependencies -RUN --mount=id=ubuntu:${ubuntu_version}-/var/cache/apt,sharing=locked,target=/var/cache/apt,type=cache \ - --mount=id=ubuntu:${ubuntu_version}-/var/lib/apt,sharing=locked,target=/var/lib/apt,type=cache \ +RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \ + --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \ export DEBIAN_FRONTEND=noninteractive && \ apt-get --yes update && \ apt-get --yes upgrade && \ @@ -72,13 +73,15 @@ COPY --from=builder \ /etc/apache2/sites-available/renderd-example-map.conf ## Fix mapnik directories +SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN sed \ --expression "s#/usr/lib/mapnik/3.1/input#$(find /usr -mindepth 1 -type d -name input | grep mapnik)#g" \ --expression "s#/usr/share/fonts/truetype#/usr/share/fonts#g" \ /usr/local/etc/renderd.conf > /etc/renderd.conf +SHELL ["/bin/sh", "-c"] ## Add configuration -RUN printf "LoadModule tile_module $(find /usr -name mod_tile.so)\n" > /etc/apache2/mods-available/tile.load +RUN printf "LoadModule tile_module %s\n" "$(find /usr -name mod_tile.so)" > /etc/apache2/mods-available/tile.load RUN printf '\n[example-map]\nMAXZOOM=20\nMINZOOM=0\nURI=/tiles/renderd-example\nXML=/usr/share/renderd/example-map/mapnik.xml\n' >> /etc/renderd.conf RUN printf '\n[example-map-jpg]\nMAXZOOM=20\nMINZOOM=0\nTYPE=jpg image/jpeg jpeg\nURI=/tiles/renderd-example-jpg\nXML=/usr/share/renderd/example-map/mapnik.xml\n' >> /etc/renderd.conf RUN printf '\n[example-map-png256]\nMAXZOOM=20\nMINZOOM=0\nTYPE=png image/png png256\nURI=/tiles/renderd-example-png256\nXML=/usr/share/renderd/example-map/mapnik.xml\n' >> /etc/renderd.conf