Skip to content

Commit e9d9bb3

Browse files
committed
CentOS Stream 10
1 parent f0811e8 commit e9d9bb3

File tree

4 files changed

+38
-11
lines changed

4 files changed

+38
-11
lines changed

docker/centos/stream/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/
3636
freetype-devel \
3737
gcc \
3838
gcc-c++ \
39-
gdal-devel \
39+
gdal-devel-$(dnf list gdal-devel --showduplicates | grep epel | awk '{print $2}') \
4040
git \
4141
harfbuzz-devel \
42+
libavif-devel \
4243
libicu-devel \
4344
libjpeg-devel \
4445
libpng-devel \
@@ -94,11 +95,12 @@ RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/
9495
freetype-devel \
9596
gcc \
9697
gcc-c++ \
97-
gdal \
98+
gdal-$(dnf list gdal --showduplicates | grep epel | awk '{print $2}') \
9899
glib2-devel \
99100
harfbuzz-devel \
100101
httpd-devel \
101102
iniparser-devel \
103+
libavif-devel \
102104
libcurl-devel \
103105
libicu-devel \
104106
libjpeg-devel \
@@ -145,10 +147,11 @@ RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/
145147
dnf --assumeyes install \
146148
boost-regex \
147149
cairo \
148-
gdal \
150+
gdal-$(dnf list gdal --showduplicates | grep epel | awk '{print $2}') \
149151
harfbuzz \
150152
httpd \
151153
iniparser \
154+
libavif \
152155
libicu \
153156
libmemcached \
154157
librados2 \

docker/centos/stream/Dockerfile.autotools

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/
3636
freetype-devel \
3737
gcc \
3838
gcc-c++ \
39-
gdal-devel \
39+
gdal-devel-$(dnf list gdal-devel --showduplicates | grep epel | awk '{print $2}') \
4040
git \
4141
harfbuzz-devel \
42+
libavif-devel \
4243
libicu-devel \
4344
libjpeg-devel \
4445
libpng-devel \
@@ -93,11 +94,12 @@ RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/
9394
cairo-devel \
9495
gcc \
9596
gcc-c++ \
96-
gdal \
97+
gdal-$(dnf list gdal --showduplicates | grep epel | awk '{print $2}') \
9798
glib2-devel \
9899
harfbuzz-devel \
99100
httpd-devel \
100101
iniparser-devel \
102+
libavif-devel \
101103
libcurl-devel \
102104
libicu-devel \
103105
libjpeg-devel \
@@ -134,10 +136,11 @@ RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/
134136
dnf --assumeyes install \
135137
boost-regex \
136138
cairo \
137-
gdal \
139+
gdal-$(dnf list gdal --showduplicates | grep epel | awk '{print $2}') \
138140
harfbuzz \
139141
httpd \
140142
iniparser \
143+
libavif \
141144
libicu \
142145
libmemcached \
143146
librados2 \

docker/centos/stream/Dockerfile.mapnik-latest

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/
3434
freetype-devel \
3535
gcc \
3636
gcc-c++ \
37-
gdal-devel \
37+
gdal-devel-$(dnf list gdal-devel --showduplicates | grep epel | awk '{print $2}') \
3838
git \
3939
harfbuzz-devel \
40+
libavif-devel \
4041
libicu-devel \
4142
libjpeg-devel \
4243
libpng-devel \
@@ -92,11 +93,12 @@ RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/
9293
freetype-devel \
9394
gcc \
9495
gcc-c++ \
95-
gdal \
96+
gdal-$(dnf list gdal --showduplicates | grep epel | awk '{print $2}') \
9697
glib2-devel \
9798
harfbuzz-devel \
9899
httpd-devel \
99100
iniparser-devel \
101+
libavif-devel \
100102
libcurl-devel \
101103
libicu-devel \
102104
libjpeg-devel \
@@ -143,10 +145,11 @@ RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/
143145
dnf --assumeyes install \
144146
boost-regex \
145147
cairo \
146-
gdal \
148+
gdal-$(dnf list gdal --showduplicates | grep epel | awk '{print $2}') \
147149
harfbuzz \
148150
httpd \
149151
iniparser \
152+
libavif \
150153
libicu \
151154
libmemcached \
152155
librados2 \

docker/docker-compose.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,31 @@ services:
7777
centos_stream_version: "9"
7878
extra_repository: crb
7979
dockerfile: docker/centos/stream/Dockerfile.mapnik-latest
80-
centos-stream-10-development:
80+
centos-stream-10:
8181
<<: *service_defaults
8282
build:
8383
<<: *build_defaults_centos_stream
8484
args:
85-
centos_stream_version: "10-development"
85+
centos_stream_version: "10"
8686
extra_repository: crb
87+
mapnik_version: "4.1.2"
88+
centos-stream-10-autotools:
89+
<<: *service_defaults
90+
build:
91+
<<: *build_defaults_centos_stream
92+
args:
93+
centos_stream_version: "10"
94+
extra_repository: crb
95+
mapnik_version: "4.1.2"
96+
dockerfile: docker/centos/stream/Dockerfile.autotools
97+
centos-stream-10-mapnik-latest:
98+
<<: *service_defaults
99+
build:
100+
<<: *build_defaults_centos_stream
101+
args:
102+
centos_stream_version: "10"
103+
extra_repository: crb
104+
dockerfile: docker/centos/stream/Dockerfile.mapnik-latest
87105
debian-10:
88106
<<: *service_defaults
89107
build:

0 commit comments

Comments
 (0)