diff --git a/docker/Dockerfile_ubuntu b/docker/Dockerfile_ubuntu index 92f55e91..6b419893 100644 --- a/docker/Dockerfile_ubuntu +++ b/docker/Dockerfile_ubuntu @@ -13,7 +13,7 @@ ENV MESHROOM_DEV=/opt/Meshroom \ MESHROOM_BUILD=/tmp/Meshroom_build \ MESHROOM_BUNDLE=/opt/Meshroom_bundle \ 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}" \ OPENIMAGEIO_LIBRARY=/opt/AliceVision_install/lib diff --git a/docker/Dockerfile_ubuntu_deps b/docker/Dockerfile_ubuntu_deps index b5e11ba1..be341076 100644 --- a/docker/Dockerfile_ubuntu_deps +++ b/docker/Dockerfile_ubuntu_deps @@ -9,7 +9,7 @@ LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com" ENV MESHROOM_DEV=/opt/Meshroom \ MESHROOM_BUILD=/tmp/Meshroom_build \ - 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_P=azerty1. @@ -53,10 +53,8 @@ RUN apt install python3-pip -y && pip3 install --upgrade pip # Install Qt (to build plugins) WORKDIR /tmp/qt COPY dl/qt.run /tmp/qt -COPY ./docker/qt-installer-noninteractive.qs ${MESHROOM_DEV}/docker/ -RUN chmod +x qt.run && \ - ./qt.run --verbose --platform minimal --script "${MESHROOM_DEV}/docker/qt-installer-noninteractive.qs" && \ - rm 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 COPY ./*requirements.txt ./setup.py ${MESHROOM_DEV}/ diff --git a/docker/build-ubuntu.sh b/docker/build-ubuntu.sh index 73b3f769..972acf20 100755 --- a/docker/build-ubuntu.sh +++ b/docker/build-ubuntu.sh @@ -3,7 +3,7 @@ set -e test -z "$MESHROOM_VERSION" && MESHROOM_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)" test -z "$AV_VERSION" && echo "AliceVision version not specified, set AV_VERSION in the environment" && exit 1 -test -z "$CUDA_VERSION" && CUDA_VERSION=11.0 +test -z "$CUDA_VERSION" && CUDA_VERSION=11.3.1 test -z "$UBUNTU_VERSION" && UBUNTU_VERSION=20.04 test -d docker || ( @@ -14,7 +14,7 @@ test -d docker || ( test -d dl || \ mkdir dl 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" + wget --no-check-certificate "https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run" -O "dl/qt.run" # DEPENDENCIES docker build \