From b9718d830afc5871df928b16728d2b501ec9d91b Mon Sep 17 00:00:00 2001 From: Remi Cresson <remi.cresson@inrae.fr> Date: Fri, 30 Sep 2022 10:06:34 +0200 Subject: [PATCH] COMP: use last OTBTF version (3.3.2), remove Mosaic fix --- Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 684ed08..dfbb63a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # # docker build --build-arg "BASE_IMAGE=mdl4eo/otbtf3.0:cpu-basic-dev" . # -ARG BASE_IMAGE=mdl4eo/otbtf3.0:gpu-dev +ARG BASE_IMAGE=mdl4eo/otbtf3.3.2:gpu-dev FROM $BASE_IMAGE LABEL description="Decloud docker image" LABEL maintainer="Remi Cresson [at] inrae [dot] fr" @@ -18,9 +18,6 @@ RUN apt upgrade -y COPY docker/requirements.txt /tmp/requirements.txt RUN python3 -m pip install -r /tmp/requirements.txt -# Fix Mosaic app in OTB <= 7.4 -RUN cd /src/otb/otb/ && git config remote.origin.fetch refs/heads/*:refs/remotes/origin/* && git fetch origin && git -c user.name=decloud-docker -c user.email=decloud@decloud.xyz cherry-pick 44ec133646c46d6772450bbf5fb3ec54e282f56b - # Build remote modules RUN cd /src/otb/otb/Modules/Remote/ && git clone https://gitlab.irstea.fr/remi.cresson/SimpleExtractionTools.git RUN cd /src/otb/otb/Modules/Remote/ && git clone https://gitlab.irstea.fr/remi.cresson/mlutils.git -- GitLab