From b5db70ea30882e1d3e4a545abe0bcdd2de7ee832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Thu, 22 Aug 2024 12:51:45 +0300 Subject: [PATCH] Include libdeflate to ubuntu-small images --- docker/README.md | 6 +++--- docker/ubuntu-small/Dockerfile | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/README.md b/docker/README.md index 582c5a0b372b..dc826714445f 100644 --- a/docker/README.md +++ b/docker/README.md @@ -58,8 +58,8 @@ Ubuntu version: * Vector drivers: all built-in + XML based ones + SQLite-based ones + network-based ones + PostgreSQL * Using internal libtiff and libgeotiff * External libraries enabled: libsqlite3, libproj, libcurl, libjpeg, libpng, libwebp, - libzstd, libexpat, libxerces-c, libpq, libssl, libgeos, libspatialite -* GDAL Python (Python 3.8 for Ubuntu 20.04, Python 3.10 for Ubuntu 22.04) + libzstd, libdeflate, libexpat, libxerces-c, libpq, libssl, libgeos, libspatialite +* GDAL Python (Python 3.8 for Ubuntu 20.04, Python 3.10 for Ubuntu 22.04, Python 3.12 for Ubuntu 24.04) * Base PROJ grid package (http://download.osgeo.org/proj/proj-datumgrid-1.8.zip) * Overall licensing terms of the GDAL build: LGPL + permissive (MIT, BSD style, Apache, etc..) @@ -74,7 +74,7 @@ See [ubuntu-small/Dockerfile](ubuntu-small/Dockerfile) * External libraries enabled: small + libnetcdf, libhdf4, libhdf5, libtiledb, libkea, mongocxx 3.4, libspatialite, unixodbc, libxml2, libcfitsio, libmysqlclient, libkml, libpoppler, pdfium, openexr, libheif, libdeflate, libparquet, libjxl -* GDAL Python (Python 3.8 for Ubuntu 20.04, Python 3.10 for Ubuntu 22.04) +* GDAL Python (Python 3.8 for Ubuntu 20.04, Python 3.10 for Ubuntu 22.04, Python 3.12 for Ubuntu 24.04) * *All* PROJ grid packages (equivalent of latest of proj-data-X.zip from http://download.osgeo.org/proj/ at time of generation, > 500 MB) * Overall licensing terms of the GDAL build: copy-left (GPL) + LGPL + permissive diff --git a/docker/ubuntu-small/Dockerfile b/docker/ubuntu-small/Dockerfile index 06a40416e35a..7a31cded59cb 100644 --- a/docker/ubuntu-small/Dockerfile +++ b/docker/ubuntu-small/Dockerfile @@ -55,6 +55,7 @@ RUN . /buildscripts/bh-set-envvars.sh \ libjpeg-dev${APT_ARCH_SUFFIX} libgeos-dev${APT_ARCH_SUFFIX} \ libexpat-dev${APT_ARCH_SUFFIX} libxerces-c-dev${APT_ARCH_SUFFIX} \ libwebp-dev${APT_ARCH_SUFFIX} libpng-dev${APT_ARCH_SUFFIX} \ + libdeflate-dev${APT_ARCH_SUFFIX} \ libzstd-dev${APT_ARCH_SUFFIX} bash zip curl \ libpq-dev${APT_ARCH_SUFFIX} libssl-dev${APT_ARCH_SUFFIX} libopenjp2-7-dev${APT_ARCH_SUFFIX} \ libspatialite-dev${APT_ARCH_SUFFIX} \ @@ -236,6 +237,7 @@ RUN apt-get update -y \ libexpat1 \ libxerces-c3.2 \ libwebp7 libpng16-16 \ + libdeflate0 \ libzstd1 bash libpq5 libssl3 libopenjp2-7 libspatialite8 \ # pil for antialias option of gdal2tiles python3-pil \