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

[docker] Fix headless Qt installation

Browse source
This commit is contained in:
Candice Bentéjac 2023-07-05 13:43:05 +02:00
parent 59a092f53a
commit 313c7cd566
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docker/Dockerfile_centos_deps
View file

@ -61,5 +61,7 @@ RUN source scl_source enable rh-python36 && pip install -r dev_requirements.txt
WORKDIR /tmp/qt WORKDIR /tmp/qt
COPY dl/qt.run /tmp/qt COPY dl/qt.run /tmp/qt
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 RUN ./qt.run --verbose --email ${QT_CI_LOGIN} --password ${QT_CI_P} --accept-obligations --accept-licenses \
--default-answer --platform minimal --no-force-installations --no-default-installations --confirm-command \
install qt.qt5.5152.gcc_64 qt.qt5.5152.qtcharts qt.qt5.5152.qtcharts.gcc_64
RUN rm qt.run

6
docker/Dockerfile_ubuntu_deps
View file

@ -43,7 +43,6 @@ RUN apt-get update && \
systemd \ systemd \
ssh ssh
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
software-properties-common software-properties-common
@ -54,7 +53,10 @@ RUN apt install python3-pip -y && pip3 install --upgrade pip
WORKDIR /tmp/qt WORKDIR /tmp/qt
COPY dl/qt.run /tmp/qt COPY dl/qt.run /tmp/qt
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 RUN ./qt.run --verbose --email ${QT_CI_LOGIN} --password ${QT_CI_P} --accept-obligations --accept-licenses \
--default-answer --platform minimal --no-force-installations --no-default-installations --confirm-command \
install qt.qt5.5152.gcc_64 qt.qt5.5152.qtcharts qt.qt5.5152.qtcharts.gcc_64
RUN rm qt.run
COPY ./*requirements.txt ./setup.py ${MESHROOM_DEV}/ COPY ./*requirements.txt ./setup.py ${MESHROOM_DEV}/