From 0f42b5dda58eb7161ce1b46f978b55a06c53fb34 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Wed, 17 Jan 2018 15:51:13 +0900
Subject: [PATCH] Update build-docker.sh
---
scripts/build-docker.sh | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
index 0f72210..9c5c482 100644
--- a/scripts/build-docker.sh
+++ b/scripts/build-docker.sh
@@ -34,16 +34,23 @@ build_flatpak() {
}
build_appimage() {
- # docker-image: ubuntu:16.04
- apt update -qq
- apt -y install curl git
-
- apt -y install build-essential qt5-default libqt5websockets5-dev
- apt -y install cmake libssl-dev libcurl4-gnutls-dev libxpm-dev
-
- apt -y install file
-
- apt -y install libssl1.0.0 zlib1g
+ # docker-image: ubuntu:14.04
+ apt-get update -qq
+ apt-get -y install curl git
+ apt-get -y install build-essential cmake
+ #apt-get -y install qt5-default libqt5websockets5-dev
+ #apt-get -y install libssl-dev libcurl4-gnutls-dev libxpm-dev
+ apt-get -y install libssl1.0.0 zlib1g
+
+ add-apt-repository -y ppa:beineri/opt-qt593-trusty
+ echo 'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /' > /etc/apt/sources.list.d/curl-httponly.list
+ curl -fsSL https://download.opensuse.org/repositories/home:TheAssassin:AppImageLibraries/xUbuntu_14.04/Release.key | apt-key add -
+ apt-get update -qq
+
+ apt-get -y install qt59base qt59websockets
+ source /opt/qt59/bin/qt59-env.sh
+
+ apt-get -y install libssl-dev libcurl3 libcurl3-gnutls libxpm-dev
useradd -m ${PKGUSER}
export HOME="/home/${PKGUSER}"
--
GitLab