revert: "chore: upgrade gdal from 3.6.1 to 3.7.0 (#479)" (#536)

* Revert "chore: upgrade gdal from 3.6.1 to 3.7.0 (#479)" This reverts commit 82e0b5e. * fix: GDAL image was pulled from dockerhub and not using latest 3.6.x (3.6.4)
linz · Jul 5, 2023 · 810b73c · 810b73c
1 parent 9347f9d
commit 810b73c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/osgeo/gdal:ubuntu-small-3.7.0
+FROM ghcr.io/osgeo/gdal:ubuntu-small-3.6.4
 
 RUN apt-get update
 # Install pip

diff --git a/scripts/gdal/gdal_preset.py b/scripts/gdal/gdal_preset.py
@@ -20,6 +20,10 @@
     # Ensure all CPUs are used for gdal translate
     "-co",
     "num_threads=all_cpus",
+    # Until GDAL 3.7.x this needs to be set as well as num_threads (https://github.com/OSGeo/gdal/issues/7478)
+    "--config",
+    "gdal_num_threads",
+    "all_cpus",
     # If not all tiles are needed in the tiff, instead of writing empty images write a null byte
     # this significantly reduces the size of tiffs which are very sparse
     "-co",