scott/docker-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Cleaned up

Browse source
This commit is contained in:
butomo1989 2018-06-12 01:05:35 +02:00
parent 68d0c2fc81
commit d6b69863ca
5 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -54,6 +54,7 @@ List of Docker images
|OSX / Windows|7.0|24|butomo1989/docker-android-arm-7.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-7.0.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-7.0 "Get your own image badge on microbadger.com")| |OSX / Windows|7.0|24|butomo1989/docker-android-arm-7.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-7.0.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-7.0 "Get your own image badge on microbadger.com")|
|OSX / Windows|7.1.1|25|butomo1989/docker-android-arm-7.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-7.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-7.1.1 "Get your own image badge on microbadger.com")| |OSX / Windows|7.1.1|25|butomo1989/docker-android-arm-7.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-arm-7.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-arm-7.1.1 "Get your own image badge on microbadger.com")|
|All |-|-|butomo1989/docker-android-real-device|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-real-device.svg)](https://microbadger.com/images/butomo1989/docker-android-real-device "Get your own image badge on microbadger.com")| |All |-|-|butomo1989/docker-android-real-device|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-real-device.svg)](https://microbadger.com/images/butomo1989/docker-android-real-device "Get your own image badge on microbadger.com")|
|All |All|All|butomo1989/docker-android-genymotion|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-genymotion.svg)](https://microbadger.com/images/butomo1989/docker-android-genymotion "Get your own image badge on microbadger.com")|
List of Devices List of Devices
--------------- ---------------
@ -176,6 +177,12 @@ You can enable proxy inside container by passing following environment variables
- HTTPS_PROXY="\<docker\_bridge\_ip\_address>" - HTTPS_PROXY="\<docker\_bridge\_ip\_address>"
- NO_PROXY="localhost" - NO_PROXY="localhost"
Genymotion
----------
Docker-Android supports [Genymotion Cloud]. What you need is [device.json] and [this sample of docker-compose file].
Control android emulator outside container Control android emulator outside container
------------------------------------------ ------------------------------------------
@ -320,6 +327,9 @@ Special Thanks
[example of compose file]: <docker-compose.yml> [example of compose file]: <docker-compose.yml>
[docker-compose]: <https://docs.docker.com/compose/install/> [docker-compose]: <https://docs.docker.com/compose/install/>
[1.13.0]: <https://github.com/docker/compose/releases/tag/1.13.0> [1.13.0]: <https://github.com/docker/compose/releases/tag/1.13.0>
[Genymotion Cloud]: <https://cloud.geny.io/signin>
[device.json]: <genymotion/example/sample_devices/devices.json>
[this sample of docker-compose file]: <genymotion/example/geny.yml>
[adb_connection]: <images/adb_connection.png> [adb_connection]: <images/adb_connection.png>
[sms]: <images/SMS.png> [sms]: <images/SMS.png>
[gian christanto]: <https://www.linkedin.com/in/gian-christanto-0b398b131/> [gian christanto]: <https://www.linkedin.com/in/gian-christanto-0b398b131/>

7
geny.yml → genymotion/example/geny.yml Normal file → Executable file
View file

@ -15,17 +15,16 @@ services:
image: butomo1989/docker-android-genymotion image: butomo1989/docker-android-genymotion
depends_on: depends_on:
- selenium_hub - selenium_hub
privileged: true
ports: ports:
- 6080:6080 - 6080:6080
- 4723:4723 - 4723:4723
volumes: volumes:
- $PWD/example/sample_apk:/opt - $PWD/sample_apk:/opt
- $PWD/genymotion/sample:/root/tmp - $PWD/sample_devices:/root/tmp
environment: environment:
- GENY_TEMPLATE=/root/tmp/devices.json - GENY_TEMPLATE=/root/tmp/devices.json
- USER=xxx - USER=xxx
- PASS=xxx - PASS=xxx
- LICENSE=xxx - LICENSE=xxx
- CONNECT_TO_GRID=True - CONNECT_TO_GRID=True
- APPIUM=true - APPIUM=true

BIN
genymotion/example/sample_apk/sample_apk_debug.apk Normal file
View file

Binary file not shown.

0
genymotion/sample/devices.json → genymotion/example/sample_devices/devices.json
View file

3
src/appium.sh
View file

@ -38,10 +38,13 @@ function run_appium() {
} }
if [[ $REAL_DEVICE = true ]]; then if [[ $REAL_DEVICE = true ]]; then
echo "Using real device"
run_appium run_appium
elif [[ $GENYMOTION = true ]]; then elif [[ $GENYMOTION = true ]]; then
echo "Using Genymotion"
prepare_geny_cloud prepare_geny_cloud
run_appium run_appium
else else
echo "Using Emulator"
python3 -m src.app python3 -m src.app
fi fi