Skip to content

Commit 9e3cb95

Browse files
committed
Update Dockerfiles
1 parent 8c99ac6 commit 9e3cb95

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

docker/centos/stream/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Arguments
33
ARG centos_stream_version=9
44
ARG extra_repository=crb
5-
ARG mapnik_version=4.0.0
5+
ARG mapnik_version=4.0.3
66

77
# Mapnik Builder
88
FROM quay.io/centos/centos:stream${centos_stream_version} AS mapnik-builder

docker/centos/stream/Dockerfile.autotools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Arguments
33
ARG centos_stream_version=9
44
ARG extra_repository=crb
5-
ARG mapnik_version=4.0.0
5+
ARG mapnik_version=4.0.3
66

77
# Mapnik Builder
88
FROM quay.io/centos/centos:stream${centos_stream_version} AS mapnik-builder

docker/debian/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# hadolint global ignore=DL3008,DL3025,DL3059
22
# Arguments
33
ARG debian_version=12
4+
ARG libiniparser_version=1
45
ARG libmapnik_version=3.1
56
ARG runner_additional_packages=libcurl4 libglib2.0
67

@@ -54,6 +55,7 @@ FROM debian:${debian_version} AS runner
5455

5556
## Arguments
5657
ARG debian_version
58+
ARG libiniparser_version
5759
ARG libmapnik_version
5860
ARG runner_additional_packages
5961

@@ -66,7 +68,7 @@ RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt
6668
apt-get --no-install-recommends --yes install ${runner_additional_packages} \
6769
apache2 \
6870
libcairo2 \
69-
libiniparser1 \
71+
libiniparser${libiniparser_version} \
7072
libmapnik${libmapnik_version} \
7173
libmemcached11 \
7274
libmemcachedutil2 \

docker/debian/Dockerfile.autotools

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# hadolint global ignore=DL3008,DL3025,DL3059
22
# Arguments
33
ARG debian_version=12
4+
ARG libiniparser_version=1
45
ARG libmapnik_version=3.1
56
ARG runner_additional_packages=libcurl4 libglib2.0
67

@@ -45,6 +46,7 @@ FROM debian:${debian_version} AS runner
4546

4647
## Arguments
4748
ARG debian_version
49+
ARG libiniparser_version
4850
ARG libmapnik_version
4951
ARG runner_additional_packages
5052

@@ -57,7 +59,7 @@ RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt
5759
apt-get --no-install-recommends --yes install ${runner_additional_packages} \
5860
apache2 \
5961
libcairo2 \
60-
libiniparser1 \
62+
libiniparser${libiniparser_version} \
6163
libmapnik${libmapnik_version} \
6264
libmemcached11 \
6365
librados2

docker/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ services:
134134
build:
135135
<<: *build_defaults_debian
136136
args:
137+
libiniparser_version: 4
137138
libmapnik_version: "4.0"
138139
debian_version: unstable
139140
runner_additional_packages: >-
@@ -144,6 +145,7 @@ services:
144145
build:
145146
<<: *build_defaults_debian
146147
args:
148+
libiniparser_version: 4
147149
libmapnik_version: "4.0"
148150
debian_version: unstable
149151
runner_additional_packages: >-

docker/opensuse/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Arguments
33
ARG boost_version
44
ARG gcc_version
5-
ARG mapnik_version=4.0.0
5+
ARG mapnik_version=4.0.3
66
ARG opensuse_release=leap
77
ARG opensuse_version=15
88

@@ -107,6 +107,7 @@ RUN --mount=type=cache,sharing=locked,id=opensuse/${opensuse_release}:${opensuse
107107
libtiff-devel \
108108
libwebp-devel \
109109
libxml2-devel \
110+
procps \
110111
proj-devel \
111112
tar
112113

0 commit comments

Comments
 (0)