VladPolskiy/openstreetmap-mod_tile-python-implementation
1
0
Fork 0
mirror of https://github.com/openstreetmap/mod_tile.git synced 2025-07-25 15:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hummeltech
2025-04-14 21:23:54 -07:00
committed by GitHub
parent c98d946f40
commit 1c0018ea1f
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker/docker-compose.yml
View File

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

4
docker/ubuntu/Dockerfile
View File

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

4
docker/ubuntu/Dockerfile.autotools
View File

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