From 6c76738e9a81f2c00236f323779af29c02b0930a Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Thu, 18 Jan 2018 07:27:58 +0900
Subject: [PATCH] Update build-docker.sh
---
scripts/build-docker.sh | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
index 14c3ef0..3edf9e3 100644
--- a/scripts/build-docker.sh
+++ b/scripts/build-docker.sh
@@ -36,22 +36,23 @@ build_flatpak() {
build_appimage() {
# docker-image: ubuntu:14.04
- apt-get update -qq
- apt-get -y install curl git
- #apt-get -y install build-essential qt5-default libqt5websockets5-dev
- #apt-get -y install cmake libssl-dev libcurl4-gnutls-dev libxpm-dev
- apt-get -y install libssl1.0.0 zlib1g
+ apt update -qq
+ apt -y install software-properties-common
+ 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 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 update -qq
- apt-get -y install build-essential qt59base qt59websockets
+ apt -y install build-essential qt59base qt59websockets
source /opt/qt59/bin/qt59-env.sh
curl -fsSL https://cmake.org/files/v3.10/cmake-3.10.0-rc5-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
- apt-get -y install libssl-dev libcurl3 libcurl3-gnutls libxpm-dev
+ apt -y install libssl-dev libcurl3 libcurl3-gnutls libxpm-dev
useradd -m ${PKGUSER}
export HOME="/home/${PKGUSER}"
--
GitLab