mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android Docker: give the android builder its own name

Browse source 
Users that use docker locally for Windows style build and Android style
builds will (probably) not like that we use the same name for both
docker containers. So, give the android builder its own name.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-12-29 08:56:08 +01:00 committed by Dirk Hohndel
parent 20c40ea6b4
commit 1e1457318c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/android/before_install.sh
View file

@ -17,7 +17,7 @@ PARENT="$( cd .. && pwd )"
docker run -v $PWD:/android/subsurface \
-v $PARENT/subsurface-mobile-build-arm:/android/subsurface-mobile-build-arm \
-v $PARENT/subsurface-mobile-build-arm64:/android/subsurface-mobile-build-arm64 \
--name=builder \
--name=android-builder \
-w /android \
-d dirkhh/android-builder:5.12.02 \
/bin/sleep 60m

2
scripts/android/travisbuild.sh
View file

@ -6,6 +6,6 @@ set -e
# by running the build wrapper again we should be able to test newer
# versions of the dependencies even without updating the docker image
# (but of course having the right things in place will save a ton of time)
docker exec -e TRAVIS="$TRAVIS" -t builder subsurface/packaging/android/android-build-wrapper.sh
docker exec -e TRAVIS="$TRAVIS" -t android-builder subsurface/packaging/android/android-build-wrapper.sh
ls -l ../subsurface-mobile-build-arm*/build/outputs/apk/