Skip to content

Commit

Permalink
[docker] Fix headless Qt installation
Browse files Browse the repository at this point in the history
  • Loading branch information
cbentejac committed Jul 5, 2023
1 parent 59a092f commit 313c7cd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions docker/Dockerfile_centos_deps
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,7 @@ RUN source scl_source enable rh-python36 && pip install -r dev_requirements.txt
WORKDIR /tmp/qt
COPY dl/qt.run /tmp/qt
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 changes: 4 additions & 2 deletions docker/Dockerfile_ubuntu_deps
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ RUN apt-get update && \
libz-dev \
systemd \
ssh


RUN apt-get install -y --no-install-recommends \
software-properties-common
Expand All @@ -54,7 +53,10 @@ RUN apt install python3-pip -y && pip3 install --upgrade pip
WORKDIR /tmp/qt
COPY dl/qt.run /tmp/qt
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}/

Expand Down

0 comments on commit 313c7cd

Please sign in to comment.