From f5a86c39df1c606493af625b0f73168738fa9170 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Mon, 27 Nov 2023 15:07:22 +0100
Subject: [PATCH 1/6] Update tools/docker/build-deps-cli.txt, Dockerfile,
.gitlab-ci.yml
---
.gitlab-ci.yml | 10 ++++++++++
Dockerfile | 22 ++++++++++++++--------
tools/docker/build-deps-cli.txt | 2 ++
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3295b83f..292adcc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -233,6 +233,16 @@ rio:
- sudo pip install rasterio
- python -m pytest --junitxml=$ARTIFACT_TEST_DIR/report_rio.xml $OTBTF_SRC/test/rio_test.py
+gdal_has_zarr_blosc:
+ extends: .applications_test_base
+ scripts:
+ - gdalinfo --format 'ZARR' | grep blosc
+
+ogr_has_arrow:
+ extends: .applications_test_base
+ scripts:
+ - ogrinfo --format 'ARROW'
+
nodata:
extends: .applications_test_base
script:
diff --git a/Dockerfile b/Dockerfile
index 8d1ee2ab..0dbdec09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,15 +11,21 @@ WORKDIR /tmp
COPY tools/docker/build-deps-*.txt ./
ARG DEBIAN_FRONTEND=noninteractive
# CLI
-RUN apt-get update -y && apt-get upgrade -y \
- && cat build-deps-cli.txt | xargs apt-get install --no-install-recommends -y \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt update -y && apt upgrade -y \
+ && cat build-deps-cli.txt | xargs apt install --no-install-recommends -y
+ && wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
+ && apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
+ && apt update \
+ && apt install -y -V libarrow${ARROW_SOVERSION} \
+ && apt install -y -V libparquet${ARROW_SOVERSION} \
+ && apt install -y -V libarrow-dataset${ARROW_SOVERSION} \
+ && apt clean && rm -rf /var/lib/apt/lists/*
# Optional GUI
ARG GUI=false
RUN if $GUI; then \
- apt-get update -y \
- && cat build-deps-gui.txt | xargs apt-get install --no-install-recommends -y \
- && apt-get clean && rm -rf /var/lib/apt/lists/* ; fi
+ apt update -y \
+ && cat build-deps-gui.txt | xargs apt install --no-install-recommends -y \
+ && apt clean && rm -rf /var/lib/apt/lists/* ; fi
### Python3 links and pip packages
RUN ln -s /usr/bin/python3 /usr/local/bin/python && ln -s /usr/bin/pip3 /usr/local/bin/pip
@@ -106,8 +112,8 @@ WORKDIR /src/otb
# SuperBuild OTB
COPY tools/docker/build-flags-otb.txt ./
-RUN apt-get update -y \
- && apt-get install --reinstall ca-certificates -y \
+RUN apt update -y \
+ && apt install --reinstall ca-certificates -y \
&& update-ca-certificates \
&& git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git \
&& cd otb && git checkout $OTB \
diff --git a/tools/docker/build-deps-cli.txt b/tools/docker/build-deps-cli.txt
index 6b7432f8..a399ac67 100644
--- a/tools/docker/build-deps-cli.txt
+++ b/tools/docker/build-deps-cli.txt
@@ -23,6 +23,7 @@ unzip
vim
wget
zip
+lsb_release
bison
libboost-date-time-dev
@@ -47,3 +48,4 @@ zlib1g-dev
libgeos++-dev
libgeos-c1v5
libgeos-dev
+libblosc1
--
GitLab
From 4b2decf8d83ed50c0b77eff630edd6134c6cc0c4 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Mon, 27 Nov 2023 15:08:51 +0100
Subject: [PATCH 2/6] CI: fix ZARR/BLOSC and Geoparquet supports tests
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 292adcc1..c74032a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -235,12 +235,12 @@ rio:
gdal_has_zarr_blosc:
extends: .applications_test_base
- scripts:
+ script:
- gdalinfo --format 'ZARR' | grep blosc
ogr_has_arrow:
extends: .applications_test_base
- scripts:
+ script:
- ogrinfo --format 'ARROW'
nodata:
--
GitLab
From 70ce3e66e2bde57868d0d691eed116ce998cba43 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Mon, 27 Nov 2023 15:32:20 +0100
Subject: [PATCH 3/6] CI: fix apache arrow comp
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 0dbdec09..50e84918 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ COPY tools/docker/build-deps-*.txt ./
ARG DEBIAN_FRONTEND=noninteractive
# CLI
RUN apt update -y && apt upgrade -y \
- && cat build-deps-cli.txt | xargs apt install --no-install-recommends -y
+ && cat build-deps-cli.txt | xargs apt install --no-install-recommends -y \
&& wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
&& apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
&& apt update \
--
GitLab
From 668b15184a7fbfff19df04b312f3a3dddb5c8ce7 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Mon, 27 Nov 2023 19:36:37 +0100
Subject: [PATCH 4/6] CI: arg arrow version
---
Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Dockerfile b/Dockerfile
index 50e84918..d05208c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ WORKDIR /tmp
COPY tools/docker/build-deps-*.txt ./
ARG DEBIAN_FRONTEND=noninteractive
# CLI
+ARG ARROW_SOVERSION=1100
RUN apt update -y && apt upgrade -y \
&& cat build-deps-cli.txt | xargs apt install --no-install-recommends -y \
&& wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
--
GitLab
From 84a3929335c134b2055df877f622014337911ab7 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Mon, 27 Nov 2023 20:02:29 +0100
Subject: [PATCH 5/6] COMP: fix deps
---
tools/docker/build-deps-cli.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/docker/build-deps-cli.txt b/tools/docker/build-deps-cli.txt
index a399ac67..86614181 100644
--- a/tools/docker/build-deps-cli.txt
+++ b/tools/docker/build-deps-cli.txt
@@ -23,7 +23,7 @@ unzip
vim
wget
zip
-lsb_release
+lsb-release
bison
libboost-date-time-dev
--
GitLab
From e71b194f78a445399c4176b09d0dcd349455930f Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Wed, 29 Nov 2023 17:00:04 +0100
Subject: [PATCH 6/6] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d05208c1..f418b750 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -105,7 +105,7 @@ RUN cd tensorflow \
### OTB
ARG GUI=false
-ARG OTB=d74ab47d4308591db4ed5a5ea3b820cef73a39fe
+ARG OTB=630a81d9d19ec340a9aaff81f6785a4a6b28c14f
ARG OTBTESTS=false
RUN mkdir /src/otb
--
GitLab