From c347c0d5f5997857e211e8a254be2efbb61c2404 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Sat, 8 Sep 2018 23:37:24 +0300
Subject: [PATCH] Fix the docker build

fixes #334
---
 .ci/install.sh      |  4 ++--
 .ci/linux/deploy.sh |  5 +----
 Dockerfile          | 50 +++++++++++++++++++++++----------------------
 Makefile            | 12 +++++++++--
 4 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index f49db9b..ed25fcf 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -24,8 +24,8 @@ if [ $TRAVIS_OS_NAME == linux ]; then
         QT_PKG="59"
     fi
 
-    wget https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh
-    sudo sh cmake-3.11.4-Linux-x86_64.sh  --skip-license  --prefix=/usr/local
+    wget https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.sh
+    sudo sh cmake-3.12.2-Linux-x86_64.sh  --skip-license  --prefix=/usr/local
 
     sudo add-apt-repository -y ppa:chris-lea/libsodium
     sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh
index 5859fc4..4e71600 100755
--- a/.ci/linux/deploy.sh
+++ b/.ci/linux/deploy.sh
@@ -31,10 +31,7 @@ unset QT_PLUGIN_PATH
 unset LD_LIBRARY_PATH
 
 export ARCH=$(uname -m)
-
-if [ ! -z $TRAVIS_TAG ]; then
-    export LD_LIBRARY_PATH=.deps/usr/lib/:$LD_LIBRARY_PATH
-fi
+export LD_LIBRARY_PATH=.deps/usr/lib/:$LD_LIBRARY_PATH
 
 ./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -bundle-non-qt-libs
 ./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -appimage
diff --git a/Dockerfile b/Dockerfile
index 963e9a2..9e9cda1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,36 +1,38 @@
-FROM ubuntu:xenial
+FROM ubuntu:trusty
 
 RUN \
     apt-get update -qq && \
-    apt-get install -y software-properties-common
-
-RUN \
-    add-apt-repository -y ppa:beineri/opt-qt-5.10.1-xenial && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository -y ppa:beineri/opt-qt-5.10.1-trusty && \
+    add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
+    add-apt-repository -y ppa:chris-lea/libsodium && \
     apt-get update -qq && \
     apt-get install -y \
-        qt510base \
-        qt510tools \
-        qt510svg \
-        qt510multimedia
+        qt510base qt510tools qt510svg qt510multimedia \
+        gcc-5 g++-5
 
 RUN \
-    add-apt-repository ppa:ubuntu-toolchain-r/test && \
-    apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" && \
-    apt-get update -qq && \
-    apt-get install -y --allow-unauthenticated \
-        gcc-7 \
-        g++-7 \
-        cmake \
-        clang-5.0 \
-        clang-format-5.0 \
-        liblmdb-dev
+    apt-get install -y \
+        make \
+        pkg-config \
+        ninja-build \
+        libsodium-dev \
+        liblmdb-dev \
+        libssl-dev \
+        mesa-common-dev \
+        wget \
+        fuse \
+        git
 
-RUN apt-get install -y mesa-common-dev wget fuse git
+RUN \
+    wget https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.sh && \
+    sudo sh cmake-3.12.2-Linux-x86_64.sh  --skip-license  --prefix=/usr/local
 
-RUN update-alternatives --install \
-        /usr/bin/clang-format \
-        clang-format \
-        /usr/bin/clang-format-5.0 100
+RUN \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 10 && \
+    update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 10 && \
+    update-alternatives --set gcc "/usr/bin/gcc-5" && \
+    update-alternatives --set g++ "/usr/bin/g++-5"
 
 ENV PATH=/opt/qt510/bin:$PATH
 
diff --git a/Makefile b/Makefile
index 76299c8..2f688d3 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,10 @@ third-party:
 		-DUSE_BUNDLED_BOOST=OFF
 	@cmake --build ${DEPS_BUILD_DIR}
 
+docker-third-party:
+	@cmake -GNinja -H${DEPS_SOURCE_DIR} -B${DEPS_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release
+	@cmake --build ${DEPS_BUILD_DIR}
+
 ci:
 	cmake -H${DEPS_SOURCE_DIR} -B${DEPS_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release
 	cmake --build ${DEPS_BUILD_DIR}
@@ -48,8 +52,12 @@ macos-deploy:
 
 docker-app-image: image
 	docker run \
-		-e CXX=g++-7 \
-		-e CC=gcc-7 \
+		-e CXX=g++-5 \
+		-e CC=gcc-5 \
+		-v `pwd`:/build nheko-app-image make docker-third-party
+	docker run \
+		-e CXX=g++-5 \
+		-e CC=gcc-5 \
 		-v `pwd`:/build nheko-app-image make release
 	docker run \
 		--privileged \