Support Ubuntu devel using libiniparser 4 in Docker CI (openstreetmap#483)

Author: hummeltech

docker/docker-compose.yml

@@ -264,13 +264,15 @@ services:
     build:
       <<: *build_defaults_ubuntu
       args:
+        libiniparser_version: 4
         libmapnik_version: "4.0"
         ubuntu_version: "devel"
   ubuntu-devel-autotools:
     <<: *service_defaults
     build:
       <<: *build_defaults_ubuntu
       args:
+        libiniparser_version: 4
         libmapnik_version: "4.0"
         ubuntu_version: "devel"
       dockerfile: docker/ubuntu/Dockerfile.autotools
@@ -279,6 +281,7 @@ services:
     build:
       <<: *build_defaults_ubuntu
       args:
+        libiniparser_version: 4
         libmapnik_version: "4.0"
         runner_additional_packages: >-
           curl

docker/ubuntu/Dockerfile

@@ -1,5 +1,6 @@
 # hadolint global ignore=DL3008,DL3025,DL3059
 # Arguments
+ARG libiniparser_version=1
 ARG libmapnik_version=3.1
 ARG runner_additional_packages
 ARG ubuntu_version=24.04
@@ -53,6 +54,7 @@ RUN export DESTDIR=/tmp/mod_tile && \
 FROM ubuntu:${ubuntu_version} AS runner
 
 ## Arguments
+ARG libiniparser_version
 ARG libmapnik_version
 ARG runner_additional_packages
 ARG ubuntu_version
@@ -68,7 +70,7 @@ RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt
         libcairo2 \
         libcurl4 \
         libglib2.0-0 \
-        libiniparser1 \
+        libiniparser${libiniparser_version} \
         libmapnik${libmapnik_version} \
         libmemcached11 \
         librados2

docker/ubuntu/Dockerfile.autotools

@@ -1,5 +1,6 @@
 # hadolint global ignore=DL3008,DL3025,DL3059
 # Arguments
+ARG libiniparser_version=1
 ARG libmapnik_version=3.1
 ARG ubuntu_version=24.04
 
@@ -43,6 +44,7 @@ RUN make test
 FROM ubuntu:${ubuntu_version} AS runner
 
 ## Arguments
+ARG libiniparser_version
 ARG libmapnik_version
 ARG ubuntu_version
 
@@ -57,7 +59,7 @@ RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt
         libcairo2 \
         libcurl4 \
         libglib2.0-0 \
-        libiniparser1 \
+        libiniparser${libiniparser_version} \
         libmapnik${libmapnik_version} \
         libmemcached11 \
         librados2