diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-12-29 08:56:08 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-22 13:02:39 +1300 |
| commit | 968b7c1f7c476f6563b74bd206c542fb16188ff2 (patch) | |
| tree | 402c5b83abc8a8b465b68084efdd3f834c5ba7c8 | |
| parent | a875fd0d44f3cfedaa0037fb0351f26314887743 (diff) | |
| download | subsurface-968b7c1f7c476f6563b74bd206c542fb16188ff2.tar.gz | |
Android Docker: give the android builder its own name
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>
| -rw-r--r-- | scripts/android/before_install.sh | 2 | ||||
| -rw-r--r-- | scripts/android/travisbuild.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/android/before_install.sh b/scripts/android/before_install.sh index 253708320..cce934cea 100644 --- a/scripts/android/before_install.sh +++ b/scripts/android/before_install.sh @@ -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 diff --git a/scripts/android/travisbuild.sh b/scripts/android/travisbuild.sh index c76fb976b..a165922bd 100644 --- a/scripts/android/travisbuild.sh +++ b/scripts/android/travisbuild.sh @@ -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/ |