advanced docker build

[ci skip]

Author: Skycoder42

tools/qdatasyncserver/dockerbuild/install.sh

@@ -1,11 +1,12 @@
 #!/bin/sh
 set -e
 
+QT_VER=5.9.1
 QT_DEPS="libglib2.0-0 libstdc++6 libpq5 ca-certificates"
 QT_BUILD_DEPS="libgl1-mesa-dev libpulse-dev g++ make git curl xauth libx11-xcb1 libfontconfig1 libdbus-1-3"
 INSTALL_DIR=/tmp/qt
 INSTALLER=$INSTALL_DIR/installer.run
-QT_DIR=$INSTALL_DIR/install/5.9/gcc_64
+QT_DIR=$INSTALL_DIR/install/$QT_VER/gcc_64
 DATASYNC_DIR=/opt/qdatasyncserver
 
 # install deps
@@ -17,6 +18,18 @@ curl -Lo $INSTALLER https://download.qt.io/official_releases/online_installers/q
 chmod +x $INSTALLER
 QT_QPA_PLATFORM=minimal $INSTALLER --script $INSTALL_DIR/qt-installer-script.qs --addRepository https://install.skycoder42.de/qtmodules/linux_x64
 
+# clone and build datasync
+mkdir /tmp/build
+cd /tmp/build
+git clone https://github.com/Skycoder42/QtDataSync.git --branch 3.0.2
+
+mkdir build
+cd build
+$QT_DIR/bin/qmake -r ../qtdatasync/
+cd tools/qdatasyncserver
+make
+make install
+
 # move libs
 QT_LIB_DIR=$QT_DIR/lib
 DATASYNC_LIB_DIR=$DATASYNC_DIR/lib/

tools/qdatasyncserver/dockerbuild/qt-installer-script.qs

@@ -30,8 +30,8 @@ Controller.prototype.TargetDirectoryPageCallback = function() {
 Controller.prototype.ComponentSelectionPageCallback = function() {
     var widget = gui.currentPageWidget();
     widget.deselectAll();
-    widget.selectComponent("qt.59.gcc_64");
-	widget.selectComponent("qt.59.skycoder42.datasync");
+    widget.selectComponent("qt.591.gcc_64");
+	widget.selectComponent("qt.591.skycoder42.backgroundprocess");
     gui.clickButton(buttons.NextButton);
 }