diff --git a/Dockerfile b/Dockerfile index cf532b7b..47bda9fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,11 +38,11 @@ COPY --from=builder /usr/local /usr/local # Install shared libraries that we depend on via APT, but *not* # the -dev packages to save space! -# Also run a smoke test +# Also run a smoke test on ODM and OpenSfM RUN bash configure.sh installruntimedepsonly \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ && bash run.sh --help - + && bash -c "eval $(python3 /code/opendm/context.py) && python3 -c 'from opensfm import io, pymap'" # Entry point ENTRYPOINT ["python3", "/code/run.py"] diff --git a/configure.sh b/configure.sh index 2dd03487..12a6880e 100755 --- a/configure.sh +++ b/configure.sh @@ -105,6 +105,8 @@ installruntimedepsonly() { echo "Installing OpenMVS Dependencies" installdepsfromsnapcraft runtime openmvs + # Fix: numpy.ndarray size changed + pip install -U numpy==1.21.1 } installreqs() { @@ -156,9 +158,6 @@ install() { mkdir -p build && cd build cmake .. && make -j$processes - # Fix: numpy.ndarray size changed - pip install -U numpy==1.21.1 - echo "Configuration Finished" } diff --git a/gpu.Dockerfile b/gpu.Dockerfile index c3c8f07c..efc2d930 100644 --- a/gpu.Dockerfile +++ b/gpu.Dockerfile @@ -39,11 +39,11 @@ COPY --from=builder /usr/local /usr/local # Install shared libraries that we depend on via APT, but *not* # the -dev packages to save space! -# Also run a smoke test +# Also run a smoke test on ODM and OpenSfM RUN bash configure.sh installruntimedepsonly \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ && bash run.sh --help - + && bash -c "eval $(python3 /code/opendm/context.py) && python3 -c 'from opensfm import io, pymap'" # Entry point ENTRYPOINT ["python3", "/code/run.py"]