diff --git a/Dockerfile.static b/Dockerfile.static index d9099a2..4b0698b 100644 --- a/Dockerfile.static +++ b/Dockerfile.static @@ -3,7 +3,7 @@ FROM ubuntu:22.04 # RUN echo 'Acquire::http { Proxy "http://192.168.1.2:3142"; };' >> /etc/apt/apt.conf.d/00proxy RUN \ - set -x && \ + set -eux && \ export DEBIAN_FRONTEND=noninteractive && \ apt -y update && \ apt -y upgrade && \ @@ -23,19 +23,16 @@ RUN \ RUN \ set -eux && \ cd /opt && \ - wget -q http://download.qt.io/official_releases/qt/5.15/5.15.9/single/qt-everywhere-src-5.15.9.tar.xz && \ - tar xf qt-everywhere-src-5.15.9.tar.xz && \ - rm qt-everywhere-src-5.15.9.tar.xz && \ - exit 0 - -RUN \ - cd /opt/qt-everywhere-src-5.15.9 && \ + wget -q https://download.qt.io/official_releases/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz && \ + tar xf qt-everywhere-opensource-src-5.15.9.tar.xz && \ + rm qt-everywhere-opensource-src-5.15.9.tar.xz && \ + cd /opt/qt-everywhere-opensource-src-5.15.9 && \ ./configure -opensource -confirm-license -release -static -nomake tests -nomake examples -skip qtwebengine \ -qt-zlib -qt-libjpeg -qt-libpng -xcb -qt-freetype -qt-pcre -qt-harfbuzz && \ - make -j $(($(nproc)+4)) && \ + make -j $(nproc) && \ make install && \ cd /opt && \ - rm -rf qt-everywhere-src-5.15.9 && \ + rm -rf qt-everywhere-opensource-src-5.15.9 && \ exit 0 ENV PATH="${PATH}:/usr/local/Qt-5.15.9/bin"