Debian Unstable and Ubuntu Devel now default to Mapnik v4.0.0 (openst…

…reetmap#450) * Fix `Dockerfile`s & `docker-compose.yml` to support this. * Mark debian:unstable & ubuntu:devel experimental
hummeltech · Jun 21, 2024 · 344215a · 344215a
1 parent 1309fdc
commit 344215a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/.github/workflows/install-package-and-test.yml b/.github/workflows/install-package-and-test.yml
@@ -11,17 +11,21 @@ on:
 
 jobs:
   install-package-and-test:
+    continue-on-error: ${{ matrix.experimental || false }}
     name: ${{ matrix.image }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         image:
           - "debian:11"
           - "debian:12"
-          - "debian:unstable"
           - "ubuntu:22.04"
           - "ubuntu:24.04"
-          - "ubuntu:devel"
+        include:
+          - image: "debian:unstable"
+            experimental: true
+          - image: "ubuntu:devel"
+            experimental: true
       fail-fast: false
     container:
       image: ${{ matrix.image }}

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
@@ -1,6 +1,7 @@
 # Arguments
 ARG debian_version=12
 ARG libmapnik_version=3.1
+ARG runner_additional_packages=libcurl4 libglib2.0
 
 # Builder
 FROM debian:${debian_version} as builder
@@ -53,18 +54,17 @@ FROM debian:${debian_version} as runner
 ## Arguments
 ARG debian_version
 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 \
     export DEBIAN_FRONTEND=noninteractive && \
     apt-get --yes update && \
     apt-get --yes upgrade && \
-    apt-get --no-install-recommends --yes install \
+    apt-get --no-install-recommends --yes install ${runner_additional_packages} \
         apache2 \
         libcairo2 \
-        libcurl4 \
-        libglib2.0 \
         libiniparser1 \
         libmapnik${libmapnik_version} \
         libmemcached11 \

diff --git a/docker/debian/Dockerfile.autotools b/docker/debian/Dockerfile.autotools
@@ -1,6 +1,7 @@
 # Arguments
 ARG debian_version=12
 ARG libmapnik_version=3.1
+ARG runner_additional_packages=libcurl4 libglib2.0
 
 # Builder
 FROM debian:${debian_version} as builder
@@ -44,18 +45,17 @@ FROM debian:${debian_version} as runner
 ## Arguments
 ARG debian_version
 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 \
     export DEBIAN_FRONTEND=noninteractive && \
     apt-get --yes update && \
     apt-get --yes upgrade && \
-    apt-get --no-install-recommends --yes install \
+    apt-get --no-install-recommends --yes install ${runner_additional_packages} \
         apache2 \
         libcairo2 \
-        libcurl4 \
-        libglib2.0 \
         libiniparser1 \
         libmapnik${libmapnik_version} \
         libmemcached11 \

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -127,15 +127,21 @@ services:
     build:
       <<: *build_defaults_debian
       args:
-        libmapnik_version: "3.1"
+        libmapnik_version: "4.0"
         debian_version: unstable
+        runner_additional_packages: >-
+          libcurl4t64
+          libglib2.0-0t64
   debian-unstable-autotools:
     <<: *service_defaults
     build:
       <<: *build_defaults_debian
       args:
-        libmapnik_version: "3.1"
+        libmapnik_version: "4.0"
         debian_version: unstable
+        runner_additional_packages: >-
+          libcurl4t64
+          libglib2.0-0t64
       dockerfile: docker/debian/Dockerfile.autotools
   fedora-34:
     <<: *service_defaults
@@ -241,22 +247,22 @@ services:
     build:
       <<: *build_defaults_ubuntu
       args:
-        libmapnik_version: "3.1"
+        libmapnik_version: "4.0"
         ubuntu_version: "devel"
   ubuntu-devel-autotools:
     <<: *service_defaults
     build:
       <<: *build_defaults_ubuntu
       args:
-        libmapnik_version: "3.1"
+        libmapnik_version: "4.0"
         ubuntu_version: "devel"
       dockerfile: docker/ubuntu/Dockerfile.autotools
   ubuntu-devel-full:
     <<: *service_defaults
     build:
       <<: *build_defaults_ubuntu
       args:
-        libmapnik_version: "3.1"
+        libmapnik_version: "4.0"
         runner_additional_packages: >-
           curl
           gdal-bin