diff --git a/docker/README.md b/docker/README.md index 6d6904275c506204d9c83f522c5ff344544d9cbf..32f53f8a1e87248091b4e2ff587da9b859f98193 100644 --- a/docker/README.md +++ b/docker/README.md @@ -54,7 +54,7 @@ docker ps # Show running containers ## Usage ### Pull, create, exec... N.B. : in previous docker images, default user was **moringa** and every python files were located in `/home/moringa` -In newer images (tag testing, now based on ubuntu 20.04), the default user is now **ubuntu** and you'll find evey python files in `/home/ubuntu/moringa` +In newer images (tag develop, now based on ubuntu:20.04), default user is **ubuntu** and you'll find evey python files in `/home/ubuntu/moringa` ```bash # Pull image (default tag is "latest") @@ -114,7 +114,7 @@ docker tag gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:focal-otb72 \ # Latest is default tag docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base -# MORINGA build from the default 'base-otb' image +# MORINGA build from the default 'moringa/base' image # You don't need to rebuild OTB if you just want to update moringa files using current branch / local commits #git checkout custom_branch docker build -f docker/moringa/Dockerfile -t gitlab-registry.irstea.fr/raffaele.gaetano/moringa . @@ -147,7 +147,7 @@ docker exec --user root moringa groupmod ubuntu -g $GID # Force reset ownership with updated UID and GID. Make sure to double check that docker exec moringa id -# Because recursive chown will apply to your volume in /home/ubuntu/data) +# Because recursive chown will apply to your volume in /home/ubuntu/data docker exec --user root moringa chown -R ubuntu:ubuntu /home/ubuntu # Stop the background container and start a new interactive shell diff --git a/docker/moringa/Dockerfile b/docker/moringa/Dockerfile index 108668c1a326c8b653c9ff4e6bbdc4b545fc88bd..3a8561019ff331270f224f0096ce143397f3e41d 100644 --- a/docker/moringa/Dockerfile +++ b/docker/moringa/Dockerfile @@ -32,7 +32,7 @@ RUN git clone -b python3 "https://github.com/olivierhagolle/theia_download.git" RUN wget -q "http://step.esa.int/thirdparties/sen2cor/2.8.0/Sen2Cor-02.08.00-Linux64.run" \ && bash Sen2Cor-02.08.00-Linux64.run && rm Sen2Cor-02.08.00-Linux64.run -f -# Install the MORINGA +# Install MORINGA RUN mkdir moringa # Copy files without .git COPY --chown=ubuntu . /home/ubuntu/moringa