3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-01 10:21:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

[docker] Qt5.15: Update CentOS docker

Browse source
This commit is contained in:
Candice Bentéjac 2023-07-04 12:10:18 +02:00
parent caa5a1e3eb
commit 15d072798c
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -44,8 +44,8 @@ ExternalProject_Add(${QMLALEMBIC_TARGET}
PREFIX ${BUILD_DIR} PREFIX ${BUILD_DIR}
BUILD_IN_SOURCE 0 BUILD_IN_SOURCE 0
BUILD_ALWAYS 0 BUILD_ALWAYS 0
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qmlalembic SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qmlAlembic
BINARY_DIR ${BUILD_DIR}/qmlalembic_build BINARY_DIR ${BUILD_DIR}/qmlAlembic_build
INSTALL_DIR ${CMAKE_INSTALL_PREFIX} INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${ALEMBIC_CMAKE_FLAGS} -DCMAKE_PREFIX_PATH:PATH=${QT_DIR} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR> CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${ALEMBIC_CMAKE_FLAGS} -DCMAKE_PREFIX_PATH:PATH=${QT_DIR} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
) )

19
docker/Dockerfile_centos
View file

@ -13,7 +13,7 @@ ENV MESHROOM_DEV=/opt/Meshroom \
MESHROOM_BUILD=/tmp/Meshroom_build \ MESHROOM_BUILD=/tmp/Meshroom_build \
MESHROOM_BUNDLE=/opt/Meshroom_bundle \ MESHROOM_BUNDLE=/opt/Meshroom_bundle \
AV_INSTALL=/opt/AliceVision_install \ AV_INSTALL=/opt/AliceVision_install \
QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \ QT_DIR=/opt/Qt/5.15.2/gcc_64 \
PATH="${PATH}:${MESHROOM_BUNDLE}" \ PATH="${PATH}:${MESHROOM_BUNDLE}" \
OPENIMAGEIO_LIBRARY=/opt/AliceVision_install/lib OPENIMAGEIO_LIBRARY=/opt/AliceVision_install/lib
@ -27,14 +27,14 @@ RUN cmake "${MESHROOM_DEV}" -DCMAKE_PREFIX_PATH="${AV_INSTALL}" -DALICEVISION_RO
RUN make "-j$(nproc)" qmlAlembic RUN make "-j$(nproc)" qmlAlembic
RUN make "-j$(nproc)" qtAliceVision RUN make "-j$(nproc)" qtAliceVision
RUN make "-j$(nproc)" && \ RUN make "-j$(nproc)" && \
rm -rf "${MESHROOM_BUILD}" "${MESHROOM_DEV}" \ rm -rf "${MESHROOM_BUILD}" "${MESHROOM_DEV}" \
${MESHROOM_BUNDLE}/aliceVision/share/doc \ ${MESHROOM_BUNDLE}/aliceVision/share/doc \
${MESHROOM_BUNDLE}/aliceVision/share/eigen3 \ ${MESHROOM_BUNDLE}/aliceVision/share/eigen3 \
${MESHROOM_BUNDLE}/aliceVision/share/fonts \ ${MESHROOM_BUNDLE}/aliceVision/share/fonts \
${MESHROOM_BUNDLE}/aliceVision/share/lemon \ ${MESHROOM_BUNDLE}/aliceVision/share/lemon \
${MESHROOM_BUNDLE}/aliceVision/share/libraw \ ${MESHROOM_BUNDLE}/aliceVision/share/libraw \
${MESHROOM_BUNDLE}/aliceVision/share/man/ \ ${MESHROOM_BUNDLE}/aliceVision/share/man/ \
aliceVision/share/pkgconfig aliceVision/share/pkgconfig
COPY *requirements.txt *.md *.py ${MESHROOM_DEV}/ COPY *requirements.txt *.md *.py ${MESHROOM_DEV}/
COPY ./docs ${MESHROOM_DEV}/docs COPY ./docs ${MESHROOM_DEV}/docs
@ -61,7 +61,6 @@ RUN source scl_source enable rh-python36 && \
${MESHROOM_BUNDLE}/lib/PySide2/rcc \ ${MESHROOM_BUNDLE}/lib/PySide2/rcc \
${MESHROOM_BUNDLE}/lib/PySide2/designer ${MESHROOM_BUNDLE}/lib/PySide2/designer
# Enable SSH X11 forwarding, needed when the Docker image # Enable SSH X11 forwarding, needed when the Docker image
# is run on a remote machine # is run on a remote machine
RUN yum -y install openssh-server xauth mesa-dri-drivers && \ RUN yum -y install openssh-server xauth mesa-dri-drivers && \

10
docker/Dockerfile_centos_deps
View file

@ -10,7 +10,7 @@ LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com"
ENV MESHROOM_DEV=/opt/Meshroom \ ENV MESHROOM_DEV=/opt/Meshroom \
MESHROOM_BUILD=/tmp/Meshroom_build \ MESHROOM_BUILD=/tmp/Meshroom_build \
MESHROOM_BUNDLE=/opt/Meshroom_bundle \ MESHROOM_BUNDLE=/opt/Meshroom_bundle \
QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \ QT_DIR=/opt/Qt/5.15.2/gcc_64 \
QT_CI_LOGIN=alicevisionjunk@gmail.com \ QT_CI_LOGIN=alicevisionjunk@gmail.com \
QT_CI_P=azerty1. QT_CI_P=azerty1.
@ -44,6 +44,8 @@ RUN yum install -y \
mesa-libGLU-devel \ mesa-libGLU-devel \
xcb-util-keysyms \ xcb-util-keysyms \
xcb-util-image \ xcb-util-image \
xcb-util-wm \
xcb-util-renderutil \
libxkbcommon-x11 libxkbcommon-x11
# Install Python3 # Install Python3
@ -58,8 +60,6 @@ RUN source scl_source enable rh-python36 && pip install -r dev_requirements.txt
# Install Qt (to build plugins) # Install Qt (to build plugins)
WORKDIR /tmp/qt WORKDIR /tmp/qt
COPY dl/qt.run /tmp/qt COPY dl/qt.run /tmp/qt
COPY ./docker/qt-installer-noninteractive.qs ${MESHROOM_DEV}/docker/ RUN chmod +x qt.run
RUN chmod +x qt.run && \ RUN ./qt.run --verbose --email ${QT_CI_LOGIN} --password ${QT_CI_P} --accept-obligations --accept-licenses --default-answer --confirm-command install qt.qt5.5152.gcc_64 qt.qt5.5152.qtcharts qt.qt5.5152.qtcharts.gcc_64
./qt.run --verbose --platform minimal --script "${MESHROOM_DEV}/docker/qt-installer-noninteractive.qs" && \
rm qt.run

3
docker/build-centos.sh
View file

@ -22,7 +22,8 @@ test -d docker || (
test -d dl || \ test -d dl || \
mkdir dl mkdir dl
test -f dl/qt.run || \ test -f dl/qt.run || \
wget "https://download.qt.io/archive/qt/5.14/5.14.1/qt-opensource-linux-x64-5.14.1.run" -O "dl/qt.run" --no-check-certificate wget --no-check-certificate "https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run" -O "dl/qt.run"
# DEPENDENCIES # DEPENDENCIES