GDAL 3.8.x release (#125)

* Bump GDAL version up * Bump boost version up * Use boost archive URI * Add documentation, update Makefile --------- Co-authored-by: Nathan Zimmerman <[email protected]>
geotrellis · Jan 5, 2024 · 3a1b9f0 · 3a1b9f0
1 parent c556738
commit 3a1b9f0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   gdal-version:
     type: string
-    default: "3.7.2"
+    default: "3.8.2"
   skip-tests:
     type: boolean
     default: false

diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.9"
 services:
   # cd .github/workflows; docker compose -f ../docker-compose.yml up build-linux-amd64
   build-linux-amd64:
-    image: daunnc/gdal-warp-bindings-environment:3.7.2-amd64
+    image: daunnc/gdal-warp-bindings-environment:3.8.2-amd64
     working_dir: /workdir
     environment:
       CC: gcc
@@ -44,7 +44,7 @@ services:
     network_mode: host
 
   build-macos-amd64:
-    image: daunnc/gdal-warp-bindings-environment:3.7.2-amd64
+    image: daunnc/gdal-warp-bindings-environment:3.8.2-amd64
     working_dir: /workdir
     environment:
       OSXCROSS_NO_INCLUDE_PATH_WARNINGS: 1

diff --git a/Docker/Dockerfile.environment-amd64 b/Docker/Dockerfile.environment-amd64
@@ -1,9 +1,9 @@
 FROM quay.io/geotrellis/gdal-warp-bindings-crossbuild:amd64-2
 LABEL maintainer="Azavea <[email protected]>"
 
-ARG GDAL_VERSION=3.7.2
-ARG GDAL_MACOS=libgdal-3.7.2-h85f6614_6.conda
-ARG GDAL_WINDOWS=release-1916-x64-gdal-3-7-2-mapserver-8-0-1-libs.zip
+ARG GDAL_VERSION=3.8.2
+ARG GDAL_MACOS=libgdal-3.8.2-hf17bf98_0.conda
+ARG GDAL_WINDOWS=release-1916-x64-gdal-3-8-1-mapserver-8-0-1-libs.zip
 ARG PROJ_VERSION=9.3.0
 ARG LIBTIFF_VERSION=4.1.0
 ARG CURL_VERSION=7.71.1
@@ -34,7 +34,7 @@ RUN cd /usr/local/src && \
 RUN wget 'https://download.osgeo.org/geotiff/samples/usgs/c41078a1.tif' -k -O /tmp/c41078a1.tif
 
 # Boost
-RUN wget 'https://boostorg.jfrog.io/artifactory/main/release/1.69.0/source/boost_1_69_0.tar.bz2' -O /tmp/boost.tar.bz2 && \
+RUN wget 'https://archives.boost.io/release/1.69.0/source/boost_1_69_0.tar.bz2' -O /tmp/boost.tar.bz2 && \
   mkdir -p /usr/local/include && \
   cd /usr/local/include && \
   tar axvf /tmp/boost.tar.bz2 && \

diff --git a/Docker/Makefile b/Docker/Makefile
@@ -15,3 +15,11 @@ gdal-3-7-2:
 		--build-arg GDAL_WINDOWS=release-1916-x64-gdal-3-7-2-mapserver-8-0-1-libs.zip \
 		-f Dockerfile.environment-amd64 \
 		-t $(DOCKER_REGISTRY)/gdal-warp-bindings-environment:3.7.2-amd64 .
+
+gdal-3-8-2:
+	docker build \
+		--build-arg GDAL_VERSION=3.8.2 \
+		--build-arg GDAL_MACOS=libgdal-3.8.2-h89a805d_1.conda \
+		--build-arg GDAL_WINDOWS=release-1916-x64-gdal-3-8-1-mapserver-8-0-1-libs.zip \
+		-f Dockerfile.environment-amd64 \
+		-t $(DOCKER_REGISTRY)/gdal-warp-bindings-environment:3.8.2-amd64 .
diff --git a/README.md b/README.md
@@ -19,8 +19,9 @@ These bindings require a GDAL installation on your machine with the appropriate
 
 | GDAL Warp Bindings | OS                    |  GDAL | Shared Library {so,dylib,dll} |
 |--------------------|-----------------------|-------|-------------------------------|
-|              3.7.0 | Linux, MacOS, Windows | 3.7.x | libgdal.so.33.3.7.2           |
-|              3.6.4 | Linux, MacOS, Windows | 3.6.x | libgdal.so.33.3.6.4           |
+|              3.8.0 | Linux, MacOS, Windows | 3.8.x | libgdal.so.34.3.8.x           |
+|              3.7.0 | Linux, MacOS, Windows | 3.7.x | libgdal.so.33.3.7.x           |
+|              3.6.4 | Linux, MacOS, Windows | 3.6.x | libgdal.so.33.3.6.x           |
 |              1.1.x | Linux (AMD64)         | 3.1.2 | libgdal.so.27                 |
 |              1.1.x | Linux (ARM64)         | 2.4.0 | libgdal.so.20                 |
 |              1.1.x | MacOS (AMD64)         | 3.1.2 | libgdal.27.dylib              |