diff --git a/linux-static/Dockerfile b/linux-static/Dockerfile index 1d9ac64..3b4ef5a 100644 --- a/linux-static/Dockerfile +++ b/linux-static/Dockerfile @@ -1,23 +1,26 @@ FROM ubuntu:latest ENTRYPOINT ["/bin/bash"] + RUN \ -apt -y update && \ -apt -y upgrade && \ -apt -y install build-essential cmake gdb git iputils-ping nano perl python valgrind wget && \ -apt -y install mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev && \ -apt -y install zlib1g-dev libssl-dev libnss3-dev libmysqlclient-dev libsqlite3-dev libxslt-dev libxml2-dev libjpeg-dev libpng-dev libopus-dev && \ -apt -y install libxcursor-dev libxcb1-dev libxcb-xkb-dev libx11-xcb-dev libxrender-dev libxi-dev libxcb-xinerama0-dev && \ -apt -y autoremove && \ -apt -y autoclean && \ -cd /opt && \ -wget -q http://download.qt.io/official_releases/qt/5.9/5.9.0/single/qt-everywhere-opensource-src-5.9.0.tar.xz && \ -tar xf qt-everywhere-opensource-src-5.9.0.tar.xz && \ -rm qt-everywhere-opensource-src-5.9.0.tar.xz && \ -cd qt-everywhere-opensource-src-5.9.0 && \ -./configure -opensource -confirm-license -release -static -nomake tests -nomake examples -no-compile-examples && \ -make -j $(($(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)+2)) && \ -make install && \ -cd /opt && \ -rm -rf qt-everywhere-opensource-src-5.9.0 && \ -exit 0 + export DEBIAN_FRONTEND=noninteractive && \ + apt -y update && \ + apt -y upgrade && \ + apt -y install build-essential cmake gdb git iputils-ping nano perl python valgrind wget && \ + apt -y install mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev && \ + apt -y install zlib1g-dev libssl-dev libnss3-dev libmysqlclient-dev libsqlite3-dev libxslt-dev libxml2-dev libjpeg-dev libpng-dev libopus-dev && \ + apt -y install libxcursor-dev libxcb1-dev libxcb-xkb-dev libx11-xcb-dev libxrender-dev libxi-dev libxcb-xinerama0-dev && \ + apt -y autoremove && \ + apt -y autoclean && \ + cd /opt && \ + wget -q http://download.qt.io/official_releases/qt/5.9/5.9.0/single/qt-everywhere-opensource-src-5.9.0.tar.xz && \ + tar xf qt-everywhere-opensource-src-5.9.0.tar.xz && \ + rm qt-everywhere-opensource-src-5.9.0.tar.xz && \ + cd qt-everywhere-opensource-src-5.9.0 && \ + ./configure -opensource -confirm-license -release -static -nomake tests -nomake examples -no-compile-examples && \ + make -j $(($(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)+2)) && \ + make install && \ + cd /opt && \ + rm -rf qt-everywhere-opensource-src-5.9.0 && \ + exit 0 + ENV PATH="${PATH}:/usr/local/Qt-5.9.0/bin" diff --git a/windows-x64/Dockerfile b/windows-x64/Dockerfile index d8a1f38..535b89b 100644 --- a/windows-x64/Dockerfile +++ b/windows-x64/Dockerfile @@ -2,30 +2,29 @@ FROM ubuntu:latest ENTRYPOINT ["/bin/bash"] RUN \ -apt -y update && \ -apt -y upgrade && \ -apt -y install build-essential iputils-ping nano \ - autoconf automake autopoint bash bison bzip2 flex gettext \ - git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \ - libtool-bin libltdl-dev libssl-dev libxml-parser-perl lzip make \ - openssl p7zip-full patch perl pkg-config python ruby scons \ - sed unzip wget xz-utils \ - g++-multilib libc6-dev-i386 && \ -apt -y autoremove && \ -apt -y autoclean && \ -apt -y clean && \ -exit 0 + export DEBIAN_FRONTEND=noninteractive && \ + apt -y update && \ + apt -y upgrade && \ + apt -y install build-essential iputils-ping nano \ + autoconf automake autopoint bash bison bzip2 flex gettext \ + git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \ + libtool-bin libltdl-dev libssl-dev libxml-parser-perl lzip make \ + openssl p7zip-full patch perl pkg-config python ruby scons \ + sed unzip wget xz-utils \ + g++-multilib libc6-dev-i386 && \ + apt -y autoremove && \ + apt -y autoclean && \ + apt -y clean && \ + exit 0 RUN \ -cd /opt && \ -git clone https://github.com/mxe/mxe.git && \ -cd /opt/mxe && \ -NPROC=$(($(nproc)+4)) && \ -make --jobs=$NPROC JOBS=$NPROC MXE_TARGETS='x86_64-w64-mingw32.static' qtbase && \ -ln -s /opt/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 /usr/bin/qmake && \ -qmake --version && \ -exit 0 + cd /opt && \ + git clone https://github.com/mxe/mxe.git && \ + cd /opt/mxe && \ + NPROC=$(($(nproc)+4)) && \ + make --jobs=$NPROC JOBS=$NPROC MXE_TARGETS='x86_64-w64-mingw32.static' qtbase && \ + ln -s /opt/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 /usr/bin/qmake && \ + qmake --version && \ + exit 0 ENV PATH="${PATH}:/opt/mxe/usr/bin" - -# qt5 qtmultimedia diff --git a/windows-x86/Dockerfile b/windows-x86/Dockerfile index 9f74420..2732b19 100644 --- a/windows-x86/Dockerfile +++ b/windows-x86/Dockerfile @@ -2,30 +2,29 @@ FROM ubuntu:latest ENTRYPOINT ["/bin/bash"] RUN \ -apt -y update && \ -apt -y upgrade && \ -apt -y install build-essential iputils-ping nano \ - autoconf automake autopoint bash bison bzip2 flex gettext \ - git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \ - libtool-bin libltdl-dev libssl-dev libxml-parser-perl lzip make \ - openssl p7zip-full patch perl pkg-config python ruby scons \ - sed unzip wget xz-utils \ - g++-multilib libc6-dev-i386 && \ -apt -y autoremove && \ -apt -y autoclean && \ -apt -y clean && \ -exit 0 + export DEBIAN_FRONTEND=noninteractive && \ + apt -y update && \ + apt -y upgrade && \ + apt -y install build-essential iputils-ping nano \ + autoconf automake autopoint bash bison bzip2 flex gettext \ + git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \ + libtool-bin libltdl-dev libssl-dev libxml-parser-perl lzip make \ + openssl p7zip-full patch perl pkg-config python ruby scons \ + sed unzip wget xz-utils \ + g++-multilib libc6-dev-i386 && \ + apt -y autoremove && \ + apt -y autoclean && \ + apt -y clean && \ + exit 0 RUN \ -cd /opt && \ -git clone https://github.com/mxe/mxe.git && \ -cd /opt/mxe && \ -NPROC=$(($(nproc)+4)) && \ -make --jobs=$NPROC JOBS=$NPROC MXE_TARGETS='i686-w64-mingw32.static' qtbase && \ -ln -s /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 /usr/bin/qmake && \ -qmake --version && \ -exit 0 + cd /opt && \ + git clone https://github.com/mxe/mxe.git && \ + cd /opt/mxe && \ + NPROC=$(($(nproc)+4)) && \ + make --jobs=$NPROC JOBS=$NPROC MXE_TARGETS='i686-w64-mingw32.static' qtbase && \ + ln -s /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 /usr/bin/qmake && \ + qmake --version && \ + exit 0 ENV PATH="${PATH}:/opt/mxe/usr/bin" - -# qt5 qtmultimedia