From 75e076f73b4df0d0ffffe4a6c7ce8864a66f6a8e Mon Sep 17 00:00:00 2001 From: Remi Cresson <remi.cresson@inrae.fr> Date: Tue, 1 Nov 2022 19:09:19 +0100 Subject: [PATCH 1/3] COMP: move otb to commit fixing planetary computer issue in URLs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7dabf6fb..487f3e19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,7 +87,7 @@ RUN git clone --single-branch -b $TF https://github.com/tensorflow/tensorflow.gi ### OTB ARG GUI=false -ARG OTB=8.1.0 +ARG OTB=c8cde1f4b35c00613b1cff38ae64bdc02f82542c ARG OTBTESTS=false RUN mkdir /src/otb -- GitLab From 0f8c2baa745a140e6a8846932bacb1238ccffc24 Mon Sep 17 00:00:00 2001 From: Remi Cresson <remi.cresson@inrae.fr> Date: Wed, 2 Nov 2022 08:32:42 +0100 Subject: [PATCH 2/3] COMP: move otb to commit fixing planetary computer issue in URLs --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 487f3e19..65601e64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,7 +98,8 @@ COPY tools/docker/build-flags-otb.txt ./ RUN apt-get update -y \ && apt-get install --reinstall ca-certificates -y \ && update-ca-certificates \ - && git clone --single-branch -b $OTB https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git \ + && git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git \ + && cd otb && git checkout $OTB \ && mkdir -p build \ && cd build \ && if $OTBTESTS; then \ -- GitLab From a888134aec80ab8209e97a07e7f278171639adee Mon Sep 17 00:00:00 2001 From: Remi Cresson <remi.cresson@inrae.fr> Date: Wed, 2 Nov 2022 11:11:28 +0100 Subject: [PATCH 3/3] COMP: move otb to commit fixing planetary computer issue in URLs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65601e64..29211d3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ RUN apt-get update -y \ && apt-get install --reinstall ca-certificates -y \ && update-ca-certificates \ && git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git \ - && cd otb && git checkout $OTB \ + && cd otb && git checkout $OTB && cd .. \ && mkdir -p build \ && cd build \ && if $OTBTESTS; then \ -- GitLab