diff --git a/.travis.yml b/.travis.yml index 8b9aeb21e5e7915f53c7edd64193f29561df50b8..e2639a1ebde6914667a98eb431f51045d37473be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,5 +11,5 @@ script: - mntdir='/mnt/ocs-manager' #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh snap" #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh flatpak" - - docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage" + - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage" - cat transfer.log diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index 0f722100ba26cded88d6bab7ee09f11966521b84..d9f8c535477f4f2413f55f3b99ee0daaaada1198 100644 --- a/scripts/build-docker.sh +++ b/scripts/build-docker.sh @@ -34,16 +34,25 @@ build_flatpak() { } build_appimage() { - # docker-image: ubuntu:16.04 + # docker-image: ubuntu:14.04 + 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 - apt -y install build-essential qt5-default libqt5websockets5-dev - apt -y install cmake libssl-dev libcurl4-gnutls-dev libxpm-dev + 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 update -qq - apt -y install file + apt -y install build-essential libgl1-mesa-dev qt59base qt59websockets + source /opt/qt59/bin/qt59-env.sh - apt -y install libssl1.0.0 zlib1g + 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 -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev useradd -m ${PKGUSER} export HOME="/home/${PKGUSER}"