Merge pull request #6 from grefab/master

Merge grefab fork
This commit is contained in:
Faraz
2020-11-01 23:03:44 -05:00
committed by GitHub

View File

@@ -1,4 +1,4 @@
FROM ubuntu:latest FROM ubuntu:20.04
ENTRYPOINT ["/bin/bash"] ENTRYPOINT ["/bin/bash"]
RUN \ RUN \
@@ -10,7 +10,8 @@ RUN \
libglu1-mesa-dev libjpeg-dev libmysqlclient-dev libnss3-dev libopus-dev \ libglu1-mesa-dev libjpeg-dev libmysqlclient-dev libnss3-dev libopus-dev \
libpng-dev libsqlite3-dev libssl-dev libx11-xcb-dev libxcb-xinerama0-dev \ libpng-dev libsqlite3-dev libssl-dev libx11-xcb-dev libxcb-xinerama0-dev \
libxcb-xkb-dev libxcb1-dev libxcursor-dev libxi-dev libxml2-dev libxrender-dev \ libxcb-xkb-dev libxcb1-dev libxcursor-dev libxi-dev libxml2-dev libxrender-dev \
libxslt-dev lzip mesa-common-dev nano perl python valgrind wget zlib1g-dev && \ libxslt-dev lzip mesa-common-dev nano perl python valgrind wget zlib1g-dev \
'^libxcb.*-dev' libxkbcommon-dev libxkbcommon-x11-dev && \
apt -y autoremove && \ apt -y autoremove && \
apt -y autoclean && \ apt -y autoclean && \
apt -y clean && \ apt -y clean && \
@@ -23,8 +24,12 @@ RUN \
wget -q http://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \ wget -q http://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \
tar xf qt-everywhere-src-5.15.0.tar.xz && \ tar xf qt-everywhere-src-5.15.0.tar.xz && \
rm qt-everywhere-src-5.15.0.tar.xz && \ rm qt-everywhere-src-5.15.0.tar.xz && \
cd qt-everywhere-src-5.15.0 && \ cd qt-everywhere-src-5.15.0
./configure -opensource -confirm-license -release -static -nomake tests -nomake examples -skip qtwebengine && \
RUN \
cd /opt/qt-everywhere-src-5.15.0 && \
./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)+4)) && \
make install && \ make install && \
cd /opt && \ cd /opt && \