Commit 1a7bf92c authored by Vincent Delbar's avatar Vincent Delbar
Browse files

ENH: more comments about Docker

parent 6bd4f0bf
......@@ -33,7 +33,7 @@ RUN apt-get update \
vim \
wget \
zip \
# OTB CLI requirements
# OTB CLI build requirements
&& apt-get install -y --no-install-recommends \
bison \
gdal-bin \
......@@ -66,10 +66,10 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*
# SuperBuild OTB with remote modules, no GUI
RUN git clone -b $OTB_BRANCH "https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git" \
RUN git clone --single-branch -b $OTB_BRANCH "https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git" \
&& mkdir /tmp/SuperBuild-archives /tmp/build /opt/otb \
&& cd /tmp/build \
# Build deps (trying only system lib, SuperBuild is required only SHARK)
# All deps are available via apt-get (except SHARK)
&& cmake /tmp/otb/SuperBuild \
-DCMAKE_BUILD_TYPE='Release' \
-DUSE_SYSTEM_BOOST=ON \
......@@ -90,6 +90,7 @@ RUN git clone -b $OTB_BRANCH "https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.
-DUSE_SYSTEM_OPENTHREADS=ON \
-DUSE_SYSTEM_OSSIM=ON \
-DUSE_SYSTEM_PNG=ON \
-DUSE_SYSTEM_SHARK=OFF \
-DUSE_SYSTEM_TINYXML=ON \
-DUSE_SYSTEM_ZLIB=ON \
-DUSE_SYSTEM_SWIG=ON \
......@@ -101,7 +102,7 @@ RUN git clone -b $OTB_BRANCH "https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.
-DDOWNLOAD_LOCATION=/tmp/SuperBuild-archives \
-DCMAKE_INSTALL_PREFIX=/opt/otb \
&& make OTB_DEPENDS -j4 \
# Clone modules
# Remote modules
&& cd /tmp/otb/Modules/Remote \
&& rm -f otbGRM.remote.cmake \
&& git clone "https://gitlab.irstea.fr/remi.cresson/GRM.git" \
......
......@@ -19,7 +19,7 @@ RUN export PY_MINOR=$(python3 -c "import sys; print(sys.version_info.minor)") \
&& touch "/usr/local/lib/python3.$PY_MINOR/dist-packages/sitsproc_c_modules/__init__.py" \
&& bash -c "source configure.sh && make -j4" && cd ../.. && rm -rf obiatools
# Default user and directory when running a container, is active now
# Default user and directory, active from now on (for later RUN commands)
RUN useradd -s /bin/bash -m ubuntu
USER ubuntu
WORKDIR /home/ubuntu
......
......@@ -9,7 +9,7 @@ Install Docker Desktop then use cmd.exe to execute docker pull and docker create
*Debian and Ubuntu*
See full documentation here : https://docs.docker.com/engine/install/ubuntu/
```bash
# Uninstall old versions
# Uninstall old versions (an old docker version is available via apt default repositories)
sudo apt-get remove docker docker-engine docker.io containerd runc
# System dependencies
......@@ -21,7 +21,7 @@ sudo apt-get install \
gnupg \
lsb-release
# Get gpg key
# Get Docker GPG key
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
# Add Docker apt repository
......@@ -111,7 +111,7 @@ docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:focal-otb72
# Tag 'moringa/base:latest' == default base image for the moringa build
docker tag gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:focal-otb72 \
gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base:latest
# Latest is default tag
# Default tag is "latest" (if not specified)
docker push gitlab-registry.irstea.fr/raffaele.gaetano/moringa/base
# MORINGA build from the default 'moringa/base' image
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment