From 1c0018ea1fe36242b2097b61d5529da43abc7250 Mon Sep 17 00:00:00 2001
From: Hummeltech <6109326+hummeltech@users.noreply.github.com>
Date: Mon, 14 Apr 2025 21:23:54 -0700
Subject: [PATCH] Support Ubuntu devel using libiniparser 4 in Docker CI (#483)

---
 docker/docker-compose.yml          | 3 +++
 docker/ubuntu/Dockerfile           | 4 +++-
 docker/ubuntu/Dockerfile.autotools | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 541937b..ad7fd59 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -264,6 +264,7 @@ services:
     build:
       <<: *build_defaults_ubuntu
       args:
+        libiniparser_version: 4
         libmapnik_version: "4.0"
         ubuntu_version: "devel"
   ubuntu-devel-autotools:
@@ -271,6 +272,7 @@ services:
     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
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index cb59006..f618f8c 100644
--- a/docker/ubuntu/Dockerfile
+++ b/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
diff --git a/docker/ubuntu/Dockerfile.autotools b/docker/ubuntu/Dockerfile.autotools
index 9d6bcbf..55a22f9 100644
--- a/docker/ubuntu/Dockerfile.autotools
+++ b/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