Commit 622458ff authored by Vincent Delbar's avatar Vincent Delbar
Browse files

Disable TLS

parent 384581fa
Pipeline #14425 failed with stage
in 38 seconds
...@@ -2,4 +2,3 @@ ...@@ -2,4 +2,3 @@
install/*.docx install/*.docx
deprecated deprecated
sitsproc_* sitsproc_*
aux_data
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
- dind - dind
variables: variables:
# Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
DOCKER_HOST: tcp://docker:2376 DOCKER_HOST: tcp://docker:2376
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: ""
stages: stages:
- moringa-docker - moringa-docker
......
...@@ -2,7 +2,7 @@ FROM gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-otb-7.0 ...@@ -2,7 +2,7 @@ FROM gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-otb-7.0
LABEL description="A container for the MORINGA processing chain, CIRAD/UMR TETIS" LABEL description="A container for the MORINGA processing chain, CIRAD/UMR TETIS"
# Compile obiatools library # Compile obiatools library
RUN git clone https://gitlab.irstea.fr/raffaele.gaetano/obiatools.git && cd obiatools/Release \ RUN git clone "https://gitlab.irstea.fr/raffaele.gaetano/obiatools.git" && cd obiatools/Release \
&& sed -i 's/$HOME\/moringa/\/usr\/local\/lib\/python3.6\/dist-packages/g' configure.sh \ && sed -i 's/$HOME\/moringa/\/usr\/local\/lib\/python3.6\/dist-packages/g' configure.sh \
&& sed -i 's/LIB=python3.6/LIB=python3.6m/g' configure.sh \ && sed -i 's/LIB=python3.6/LIB=python3.6m/g' configure.sh \
&& mkdir /usr/local/lib/python3.6/dist-packages/sitsproc_c_modules \ && mkdir /usr/local/lib/python3.6/dist-packages/sitsproc_c_modules \
...@@ -11,7 +11,7 @@ RUN git clone https://gitlab.irstea.fr/raffaele.gaetano/obiatools.git && cd obia ...@@ -11,7 +11,7 @@ RUN git clone https://gitlab.irstea.fr/raffaele.gaetano/obiatools.git && cd obia
# Other python deps: rios, fmask # Other python deps: rios, fmask
RUN pip3 install rios.core \ RUN pip3 install rios.core \
&& wget -q https://github.com/ubarsc/python-fmask/releases/download/pythonfmask-0.5.4/python-fmask-0.5.4.tar.gz \ && wget -q "https://github.com/ubarsc/python-fmask/releases/download/pythonfmask-0.5.4/python-fmask-0.5.4.tar.gz" \
&& tar -xzf python-fmask-0.5.4.tar.gz && cd python-fmask-0.5.4 \ && tar -xzf python-fmask-0.5.4.tar.gz && cd python-fmask-0.5.4 \
&& python3 setup.py install && cd .. && rm -rf python-fmask-* && python3 setup.py install && cd .. && rm -rf python-fmask-*
ENV RIOS_DFLT_DRIVER="GTiff" ENV RIOS_DFLT_DRIVER="GTiff"
...@@ -22,13 +22,13 @@ USER moringa ...@@ -22,13 +22,13 @@ USER moringa
WORKDIR /home/moringa WORKDIR /home/moringa
# Clone peps and theia utils # Clone peps and theia utils
RUN git clone -b python3 https://github.com/olivierhagolle/theia_download.git \ RUN git clone -b python3 "https://github.com/olivierhagolle/theia_download.git" \
&& git clone https://github.com/olivierhagolle/peps_download.git && git clone "https://github.com/olivierhagolle/peps_download.git"
# Install Sen2Cor # Install Sen2Cor
RUN wget -q https://step.esa.int/thirdparties/sen2cor/2.8.0/Sen2Cor-02.08.00-Linux64.run \ RUN wget -q "https://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 && bash Sen2Cor-02.08.00-Linux64.run && rm Sen2Cor-02.08.00-Linux64.run -f
# Copy all required files from repo # Copy all required files from repo
COPY --chown=moringa *.py *.cfg /home/moringa/ COPY --chown=moringa *.py *.cfg /home/moringa/
#COPY --chown=moringa aux_data /home/moringa/aux_data COPY --chown=moringa aux_data /home/moringa/aux_data
FROM gitlab-registry.irstea.fr/raffaele.gaetano/moringa:base-otb-7.0
LABEL description="A container for the MORINGA processing chain, CIRAD/UMR TETIS"
# Compile obiatools library
RUN git clone https://gitlab.irstea.fr/raffaele.gaetano/obiatools.git && cd obiatools/Release \
&& sed -i 's/$HOME\/moringa/\/usr\/local\/lib\/python3.6\/dist-packages/g' configure.sh \
&& sed -i 's/LIB=python3.6/LIB=python3.6m/g' configure.sh \
&& mkdir /usr/local/lib/python3.6/dist-packages/sitsproc_c_modules \
&& touch /usr/local/lib/python3.6/dist-packages/sitsproc_c_modules/__init__.py \
&& bash -c "source configure.sh && make" && cd ../.. && rm -rf obiatools
# Other python deps: rios, fmask
RUN pip3 install rios.core \
&& wget -q https://github.com/ubarsc/python-fmask/releases/download/pythonfmask-0.5.4/python-fmask-0.5.4.tar.gz \
&& tar -xzf python-fmask-0.5.4.tar.gz && cd python-fmask-0.5.4 \
&& python3 setup.py install && cd .. && rm -rf python-fmask-*
ENV RIOS_DFLT_DRIVER="GTiff"
# Default user and directory when running a container, is active now
RUN useradd -s /bin/bash -m moringa
USER moringa
WORKDIR /home/moringa
# Clone peps and theia utils
RUN git clone -b python3 https://github.com/olivierhagolle/theia_download.git \
&& git clone https://github.com/olivierhagolle/peps_download.git
# Install Sen2Cor
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
# Copy all required files from repo
COPY --chown=moringa aux_data /home/moringa/aux_data
COPY --chown=moringa *.py *.cfg /home/moringa/
\ No newline at end of file
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