diff --git a/Dockerfile b/Dockerfile index f615f428..093f7883 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,8 @@ ENV MESHROOM_DEV=/opt/Meshroom \ QT_DIR=/opt/qt/5.13.0/gcc_64 \ PATH="${PATH}:${MESHROOM_BUNDLE}" -COPY . "${MESHROOM_DEV}" +# Workaround for qmlAlembic/qtAliceVision builds: fuse lib/lib64 folders +RUN cp -rf "${AV_INSTALL}/lib/*" "${AV_INSTALL}/lib64" && rm -rf "${AV_INSTALL}/lib" && ln -s "${AV_INSTALL}/lib64" "${AV_INSTALL}/lib" # Install libs needed by Qt RUN yum install -y \ @@ -39,6 +40,8 @@ RUN yum install -y \ RUN yum install -y centos-release-scl RUN yum install -y rh-python36 +COPY . "${MESHROOM_DEV}" + # Install Meshroom requirements and freeze bundle RUN source scl_source enable rh-python36 && cd "${MESHROOM_DEV}" && pip install -r dev_requirements.txt -r requirements.txt && python setup.py install_exe -d "${MESHROOM_BUNDLE}" && \ find ${MESHROOM_BUNDLE} -name "*Qt5Web*" -delete && \ @@ -59,11 +62,12 @@ RUN curl -LO http://download.qt.io/official_releases/online_installers/qt-unifie rm ./qt-unified-linux-x64-online.run WORKDIR ${MESHROOM_BUILD} -# Temporary workaround for qmlAlembic build -RUN rm -rf "${AV_INSTALL}/lib" && ln -s "${AV_INSTALL}/lib64" "${AV_INSTALL}/lib" # Build Meshroom plugins RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DQT_DIR="${QT_DIR}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins" +# RUN make -j8 qtOIIO +# RUN make -j8 qmlAlembic +# RUN make -j8 qtAliceVision RUN make -j8 && cd /tmp && rm -rf ${MESHROOM_BUILD} RUN mv "${AV_BUNDLE}" "${MESHROOM_BUNDLE}/aliceVision"