Doc: mention Docker images [ci skip]

OSGeo · May 29, 2019 · f7b73ed · f7b73ed
1 parent ab50447
commit f7b73ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/gdal/doc/source/download.rst b/gdal/doc/source/download.rst
@@ -87,3 +87,11 @@ available at https://anaconda.org/conda-forge/gdal.
     conda install -c conda-forge gdal
 
 
+Linux Docker images
+................................................................................
+
+Images with nightly builds of GDAL master and tagged releases are available at
+`Docker Hub <https://hub.docker.com/r/osgeo/gdal/tags>`_
+
+Information on the content of the different configurations can be found at
+`https://github.com/OSGeo/gdal/tree/master/gdal/docker <https://github.com/OSGeo/gdal/tree/master/gdal/docker>`_
diff --git a/gdal/docker/README.md b/gdal/docker/README.md
@@ -35,12 +35,12 @@ See [alpine-small/Dockerfile](alpine-small/Dockerfile)
 
 ## Nomal: `osgeo/gdal:alpine-normal-latest`
 
-* Image size: ~ 155 MB
+* Image size: ~ 175 MB
 * Raster drivers: small + netCDF, HDF5, BAG
 * Vector drivers: small + Spatialite, XLS
 * External libraries enabled: small + libgeos, libhdf5, libhdf5, libkea, libnetcdf, libfreexl,
   libspatialite, libxml2, libpoppler
-* GDAL Python (Python 2.7)
+* GDAL Python (Python 3.6)
 * Base PROJ grid package
 * Overall licensing terms of the GDAL build: copy-left (GPL) + LGPL + permissive
 
@@ -55,7 +55,7 @@ See [alpine-normal/Dockerfile](alpine-normal/Dockerfile)
 * Vector drivers: all built-in + XML based ones + SQLite-based ones + network-based ones + PostgreSQL
 * External libraries enabled: libsqlite3, libproj, libcurl, libjpeg, libpng, libwebp,
   libzstd, libexpat, libxerces-c, libpq, libssl, libgeos
-* GDAL Python (Python 2.7)
+* GDAL Python (Python 3.6)
 * Base PROJ grid package
 * Overall licensing terms of the GDAL build: LGPL + permissive (X/MIT, BSD style, Apache, etc..)
 
@@ -69,7 +69,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
-* GDAL Python (Python 2.7)
+* GDAL Python (Python 3.6)
 * *All* PROJ grid packages
 * Overall licensing terms of the GDAL build: copy-left (GPL) + LGPL + permissive