summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-07 00:39:39 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-07 00:39:39 +0200
commit450f0992a09b5ef8cc1aa1df5eafd6826e03c4b8 (patch)
tree169e61d845e962447dbf2f8d42d951414cdc29fc
parent818f02ec4a5045328363056ebdfa6c681c9a1d58 (diff)
downloadsubsurface-450f0992a09b5ef8cc1aa1df5eafd6826e03c4b8.tar.gz
Travis: fix Android build by forcing Ubuntu:xenial for container
The build fails with newer versions and Ubuntu:latest switched to bionic a few weeks ago. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--scripts/android/before_install.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/android/before_install.sh b/scripts/android/before_install.sh
index 000d1a760..14b7cb4ff 100644
--- a/scripts/android/before_install.sh
+++ b/scripts/android/before_install.sh
@@ -7,7 +7,7 @@ git pull --tags
git describe
# Ugly, but keeps it running during the build
-docker run -v $PWD:/workspace/subsurface --name=builder -w /workspace -d ubuntu /bin/sleep 60m
+docker run -v $PWD:/workspace/subsurface --name=builder -w /workspace -d ubuntu:xenial /bin/sleep 60m
docker exec -t builder apt-get update
# subsurface android build dependencies
docker exec -t builder apt-get install -y git cmake autoconf libtool-bin openjdk-8-jdk-headless ant wget unzip python bzip2 pkg-config