Skip to content
Snippets Groups Projects
Commit 28f64588 authored by fabien contival's avatar fabien contival
Browse files

Fix Dockerfile for otb<9 + Add --no-cache option

parent fbd29200
No related branches found
No related tags found
1 merge request!7Resolve "Integrate Gamma0 RTC into dockers"
Pipeline #15508 failed
......@@ -465,7 +465,7 @@ if _is_set user_dir ; then
args=($(_replace_in_array CI_COMMIT_SHA= CI_COMMIT_SHA="$(cd "${wrk_dir}" && _git_sha)" "${args[@]}"))
(_execute cd "${wrk_dir}" &&
# _execute docker build -t "${dest_repository}/s1tiling:${S1TILING_VERSION}-${OS}-otb${OTB_VERSION}" "${args[@]}" -f "docker/${DOCKERFILE_NAME}" .)
_execute docker build -t "${dest_repository}/s1tiling:${S1TILING_VERSION}-${OS}-otb${OTB_VERSION}" "${args[@]}" -f "${step_dockerfile["${step}"]}" .)
_execute docker build --no-cache -t "${dest_repository}/s1tiling:${S1TILING_VERSION}-${OS}-otb${OTB_VERSION}" "${args[@]}" -f "${step_dockerfile["${step}"]}" .)
# _execute docker build -t "${dest_repository}/s1tiling:${S1TILING_VERSION}-${OS}-otb${OTB_VERSION}" "${args[@]}" .)
fi
......
......@@ -133,7 +133,7 @@ RUN uname -a \
&& make && make install \
&& mv "${OTB_INSTALL_DIRNAME}/lib"/otbapp_*.so "${OTB_INSTALL_DIRNAME}/lib/otb/applications" \
&& cd /tmp \
&& rm -r /tmp/* \
&& rm -r normlim_sigma0 \
\
&& git clone https://{user}:{token}@gitlab.orfeo-toolbox.org/s1-tiling/gamma0-rtc.git \
&& cd /tmp/gamma0-rtc \
......@@ -147,7 +147,7 @@ RUN uname -a \
&& make && make install \
&& mv "${OTB_INSTALL_DIRNAME}/lib"/otbapp_*.so "${OTB_INSTALL_DIRNAME}/lib/otb/applications" \
&& cd /tmp \
&& rm -r /tmp/* \
&& rm -r gamma0-rtc \
\
&& rm -r "${OTB_INSTALL_DIRNAME}/share/otb/swig/build" \
&& rm -r "${OTB_INSTALL_DIRNAME}/bin/otbgui"* \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment