Merge pull request #142 from nonVoid/master

Fixed #135

.travis.yml

@@ -18,7 +18,9 @@ env:
   - ANDROID_VERSION=7.1.1
   - ANDROID_VERSION=8.0
   - ANDROID_VERSION=8.1
+  - ANDROID_VERSION=9.0
   - REAL_DEVICE=True
+  - GENYMOTION=True
 
 script: bash travis.sh
 

Analytics.md

@@ -0,0 +1,37 @@
+# Docker-Android's Anonymous Aggregate User Behaviour Analytics
+Docker-Android has begun gathering anonymous aggregate user behaviour analytics and reporting these to Google Analytics. You are notified about this when you start Docker-Android.
+
+## Why?
+Docker-Android is provided free of charge for our internal and external users and we don't have direct communication with its users nor time resources to ask directly for their feedback. As a result, we now use anonymous aggregate user analytics to help us understand how Docker-Android is being used, the most common used features based on how, where and when people use it. With this information we can prioritize some features over other ones.
+
+## What?
+Docker-Android's analytics record some shared information for every event:
+
+- The Google Analytics version i.e. `1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#v)
+- The Google Analytics anonymous IP setting is enabled i.e. `1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#aip)
+- The Docker-Android analytics tracking ID e.g. `UA-133466903-1` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#tid)
+- The release version of machine, e.g. `Linux_version_4.4.16-boot2docker_(gcc_version_4.9.2_(Debian_4.9.2-10)_)_#1_SMP_Fri_Jul_29_00:13:24_UTC_2016` This does not allow us to track individual users but does enable us to accurately measure user counts vs. event counts (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#cid)
+- Docker-Android analytics hit type, e.g. `event` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#t)
+- Application type, e.g. `Emulator` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#ec)
+- Description will contains information about Emulator configuration, e.g. `Processor type`. (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#el)
+- Docker-Android application name, e.g. `docker-android` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#an)
+- Docker-Android application version, e.g. `1.5-p0` (https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#av)
+
+With the recorded information, it is not possible for us to match any particular real user.
+
+As far as we can tell it would be impossible for Google to match the randomly generated analytics user ID to any other Google Analytics user ID. If Google turned evil the only thing they could do would be to lie about anonymising IP addresses and attempt to match users based on IP addresses.
+
+## When/Where?
+Docker-Android's analytics are sent throughout Docker-Android's execution to Google Analytics over HTTPS.
+
+## Who?
+Docker-Android's analytics are accessible to Docker-Android's current maintainers. Contact [@butomo1989](https://github.com/butomo1989) if you are a maintainer and need access.
+
+## How?
+The code is viewable in [this lines](./src/appium.sh#L225-L247).
+
+## Opting out before starting Docker-Android
+Docker-Android analytics helps us, maintainers and leaving it on is appreciated. However, if you want to opt out and not send any information, you can do this by using passing environment variable GA=false to the Docker container.
+
+## Disclaimer
+This document and the implementation are based on the great idea implemented by [Homebrew](https://github.com/Homebrew/brew/blob/master/docs/Analytics.md)

LICENSE

@@ -1,13 +0,0 @@
-Copyright 2016 budi utomo
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

LICENSE.md

@@ -0,0 +1,36 @@
+## License Information
+
+Copyright 2016 budi utomo
+
+This program is subject to the terms of the Apache License, Version 2.0 AND the following amendments on forks and data processing. Thus, this is a Custom Apache 2.0 License, NOT a dual-license model you may choose from.
+
+
+You can obtain a copy of the license at http://www.apache.org/licenses/LICENSE-2.0
+
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+
+## Forks
+Additionally to Apache-2.0, when you fork this repo you are required to either remove our Google Analytics tracking ID: UA-133466903-1 or stop usage gathering completely.
+
+## Data processing agreement
+By using this software you agree that the following non-PII (non personally identifiable information) data will be collected, processed and used by the maintainers for the purpose of improving the docker-android project. Anonymisation with respect of the IP address means that only the first two octets of the IP address are collected.
+
+
+By using this software you also grant us a nonexclusive, irrevocable, world-wide, perpetual royalty-free permission to use, modify and publish these data for all purposes, internally or publicly, including the right to sub-license said permission rights.
+
+
+We collect, process and use the following data:
+
+* Release version of Docker-Android
+* Anonymized IP address (only first two octets)
+* Country and city
+* Date and time when Docker-Android started
+* User (it will collect the information about Release Version of Machine)
+* Application type, e.g. Emulator or Device or Genymotion
+* Emulator configuration, e.g. Processor type, Device name, Appium mode, Selenium grid mode and mobile test mode
+
+## End of License Information
+
+More information about anonymized data collection can be seen [here](Analytics.md)

MAINTAINERS

@@ -1 +1 @@
-Budi Utomo <budi.ut.1989@gmail.com>
+Budi Utomo <budtmo.os@gmail.com>

README.md

@@ -2,17 +2,15 @@
   <img id="header" src="./images/logo_dockerandroid_small.png" />
 </p>
 
+[![Analytics](https://ga-beacon.appspot.com/UA-133466903-1/github/budtmo/docker-android/README.md)](https://github.com/igrigorik/ga-beacon "Analytics")
 [![Join the chat at https://gitter.im/butomo1989/docker-android](https://badges.gitter.im/butomo1989/docker-android.svg)](https://gitter.im/butomo1989/docker-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/butomo1989/docker-android.svg?branch=master)](https://travis-ci.org/butomo1989/docker-android)
-[![codecov](https://codecov.io/gh/butomo1989/docker-android/branch/master/graph/badge.svg)](https://codecov.io/gh/butomo1989/docker-android)
+[![Build Status](https://travis-ci.org/budtmo/docker-android.svg?branch=master)](https://travis-ci.org/budtmo/docker-android)
+[![codecov](https://codecov.io/gh/budtmo/docker-android/branch/master/graph/badge.svg)](https://codecov.io/gh/budtmo/docker-android)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3f000ffb97db45a59161814e1434c429)](https://www.codacy.com/app/butomo1989/docker-appium?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=butomo1989/docker-appium&amp;utm_campaign=Badge_Grade)
+[![GitHub release](https://img.shields.io/github/release/budtmo/docker-android.svg)](https://github.com/budtmo/docker-android/releases)
 
 Docker-Android is a docker image built to be used for everything related to mobile website testing and Android project.
 
-<p align="center">
-   <a href="https://youtu.be/pQdpjuYwvp8"><img src="./images/appiumconf2018.png" alt="Appium Conference 2018" width="600"></a>
-</p>
-
 Emulator - Samsung Device    | Emulator - Nexus Device     | Real Device  
 :---------------------------:|:---------------------------:|:---------------------------:
 ![][emulator samsung]        |![][emulator nexus]          |![][real device]   
@@ -43,15 +41,16 @@ List of Docker images
 
 |OS   |Android   |API   |Browser   |Browser version   |Chromedriver   |Image   |Size   |
 |:---|:---|:---|:---|:---|:---|:---|:---|
-|Linux|5.0.1|21|browser|37.0|2.21|butomo1989/docker-android-x86-5.0.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-5.0.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-5.0.1 "Get your own image badge on microbadger.com")|
-|Linux|5.1.1|22|browser|39.0|2.13|butomo1989/docker-android-x86-5.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-5.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-5.1.1 "Get your own image badge on microbadger.com")|
-|Linux|6.0|23|browser|44.0|2.18|butomo1989/docker-android-x86-6.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-6.0.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-6.0 "Get your own image badge on microbadger.com")|
-|Linux|7.0|24|chrome|51.0|2.23|butomo1989/docker-android-x86-7.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-7.0.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-7.0 "Get your own image badge on microbadger.com")|
-|Linux|7.1.1|25|chrome|55.0|2.28|butomo1989/docker-android-x86-7.1.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-7.1.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-7.1.1 "Get your own image badge on microbadger.com")|
-|Linux|8.0|26|chrome|58.0|2.31|butomo1989/docker-android-x86-8.0|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-8.0.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-8.0 "Get your own image badge on microbadger.com")|
-|Linux|8.1|27|chrome|61.0|2.33|butomo1989/docker-android-x86-8.1|[![](https://images.microbadger.com/badges/image/butomo1989/docker-android-x86-8.1.svg)](https://microbadger.com/images/butomo1989/docker-android-x86-8.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")|
-|Linux|All|All|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")|
+|Linux|5.0.1|21|browser|37.0|2.21|budtmo/docker-android-x86-5.0.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-5.0.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-5.0.1 "Get your own image badge on microbadger.com")|
+|Linux|5.1.1|22|browser|39.0|2.13|budtmo/docker-android-x86-5.1.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-5.1.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-5.1.1 "Get your own image badge on microbadger.com")|
+|Linux|6.0|23|browser|44.0|2.18|budtmo/docker-android-x86-6.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-6.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-6.0 "Get your own image badge on microbadger.com")|
+|Linux|7.0|24|chrome|51.0|2.23|budtmo/docker-android-x86-7.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-7.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-7.0 "Get your own image badge on microbadger.com")|
+|Linux|7.1.1|25|chrome|55.0|2.28|budtmo/docker-android-x86-7.1.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-7.1.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-7.1.1 "Get your own image badge on microbadger.com")|
+|Linux|8.0|26|chrome|58.0|2.31|budtmo/docker-android-x86-8.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-8.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-8.0 "Get your own image badge on microbadger.com")|
+|Linux|8.1|27|chrome|61.0|2.33|budtmo/docker-android-x86-8.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-8.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-8.1 "Get your own image badge on microbadger.com")|
+|Linux|9.0|28|chrome|66.0|2.40|budtmo/docker-android-x86-9.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-9.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-9.0 "Get your own image badge on microbadger.com")|
+|All |-|-|-|-|-|budtmo/docker-android-real-device|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-real-device.svg)](https://microbadger.com/images/budtmo/docker-android-real-device "Get your own image badge on microbadger.com")|
+|Linux|All|All|All|All|All|budtmo/docker-android-genymotion|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-genymotion.svg)](https://microbadger.com/images/budtmo/docker-android-genymotion "Get your own image badge on microbadger.com")|
 
 List of Devices
 ---------------
@@ -78,7 +77,7 @@ Quick Start
 	- For ***Linux OS***, please use image name that contains "x86"
 
 		```bash
-		docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container butomo1989/docker-android-x86-8.1
+		docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container budtmo/docker-android-x86-8.1
 		```
 
 	- For ***OSX*** and ***Windows OS***, please use Virtual Machine that support Virtualization with Ubuntu OS
@@ -115,8 +114,35 @@ Docker-Android can be used for building Android project and executing its unit t
 2. Build the project
 
     ```bash
-    docker run -it --rm -v $PWD/android-testing/ui/espresso/BasicSample:/root/tmp butomo1989/docker-android-x86-8.1 tmp/gradlew build
+    docker run -it --rm -v $PWD/android-testing/ui/espresso/BasicSample:/root/tmp budtmo/docker-android-x86-8.1 tmp/gradlew build
     ```
+    
+Control Android connected to host (Emulator or Real Device)
+-----------------------------------------------------------
+1. Create a docker container with this command 
+
+	```
+	$ docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 --name android-container-appium budtmo/docker-android-real-device
+	```
+	
+2. Open noVNC [http://localhost:6080](http://localhost:6080)
+
+3. Open terminal by clicking right on **noVNC** window >> **Terminal emulator**
+
+4. To connect to host's adb (make sure your host have adb and connected to the device.) 
+
+	```
+	$ adb -H host.docker.internal devices
+	```
+	
+	To specify port, just add `-P port_number`
+
+	```
+	$ adb -H host.docker.internal -P 5037 devices
+	```
+	
+5. Now your container can access your host devices. But, you need to add `remoteAdbHost` and `adbPort` desired capabilities to make **Appium** can recognise those devices.  
+
 
 Appium and Selenium Grid
 ------------------------
@@ -190,9 +216,11 @@ This [document](README_CLOUD.md) contains information about deploying Docker-And
 Genymotion
 ----------
 
-![Genymotion](images/logo_genymotion.png)
+<p align="center">
+  <img id="geny" src="./images/logo_genymotion_and_dockerandroid.png" />
+</p>
 
-For you who do not have ressources to maintain the simulator or to buy machines or need different device profiles, you need to give a try to [Genymotion Cloud](https://www.genymotion.com/cloud/). Docker-Android is integrated with Genymotion on different cloud services, e.g. Genymotion Cloud, AWS, GCP, Alibaba Cloud. Please follow [this document](README_GENYMOTION.md) for more detail.
+For you who do not have ressources to maintain the simulator or to buy machines or need different device profiles, you need to give a try to [Genymotion Cloud](https://www.genymotion.com/cloud/). Docker-Android is integrated with Genymotion on different cloud services, e.g. Genymotion Cloud, AWS, GCP, Alibaba Cloud. Please follow [this document](README_GENYMOTION.md) or [this blog](https://medium.com/genymobile/run-your-appium-tests-using-docker-android-genymotion-cloud-e4817132ccd8) for more detail.
 
 Troubleshooting
 ---------------
@@ -206,8 +234,12 @@ Special Thanks
 --------------
 - [Gian Christanto] for creating a great logo!
 
+LICENSE
+--------------
+See [License](LICENSE.md)
+
 [appium]: <https://appium.io>
-[espresso]: <https://google.github.io/android-testing-support-library/docs/espresso/>
+[espresso]: <https://developer.android.com/training/testing/espresso/>
 [robotium]: <https://github.com/RobotiumTech/robotium>
 [emulator samsung]: <images/emulator_samsung_galaxy_s6.png>
 [emulator nexus]: <images/emulator_nexus_5.png>

README_APPIUM_AND_SELENIUM.md

@@ -4,7 +4,7 @@ Run Appium Server
 Appium is automation test framework to test mobile website and mobile application, including Android. To be able to use Appium, you need to run appium-server. You run Appium-Server inside docker-android container by ***opening port 4723*** and ***passing an environment variable APPIUM=true***.
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true --name android-container budtmo/docker-android-x86-8.1
 ```
 
 ### Share Volume
@@ -12,7 +12,7 @@ docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 -
 If you want to use appium to test UI of your android application, you need to share volume where the APK is located to folder ***/root/tmp***.
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v $PWD/example/sample_apk:/root/tmp -e DEVICE="Nexus 5" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v $PWD/example/sample_apk:/root/tmp -e DEVICE="Nexus 5" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 --name android-container budtmo/docker-android-x86-8.1
 ```
 
 ### Connect to Selenium Grid
@@ -30,7 +30,7 @@ To run tests for mobile browser, following parameter can be passed:
 - MOBILE\_WEB\_TEST=true
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 -e MOBILE_WEB_TEST=true --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e APPIUM=true -e CONNECT_TO_GRID=true -e APPIUM_HOST="127.0.0.1" -e APPIUM_PORT=4723 -e SELENIUM_HOST="172.17.0.1" -e SELENIUM_PORT=4444 -e MOBILE_WEB_TEST=true --name android-container budtmo/docker-android-x86-8.1
 ```
 
 ### Video Recording

README_CLOUD.md

@@ -3,3 +3,23 @@ Azure
 
 Make sure that the nodes, pods, containers for your emulators are generated within a **VM** of series **Dv3** or **Ev3**.
 Reference: https://docs.microsoft.com/en-us/azure/virtual-machines/windows/nested-virtualization
+
+AWS
+-----
+Make sure that containers for your emulators are generated within a EC2 Bare Metal Instance(i3.metal)
+Reference: https://aws.amazon.com/jp/blogs/aws/new-amazon-ec2-bare-metal-instances-with-direct-access-to-hardware/
+
+Google Cloud (GCE)
+------------------
+Make sure your instances for your emulators have Nested Virtualization enabled
+Reference: https://cloud.google.com/compute/docs/instances/enable-nested-virtualization-vm-instances
+
+One the disk and instance are created as [specified here](https://cloud.google.com/compute/docs/instances/enable-nested-virtualization-vm-instances#enablenestedvirt),
+the emulator can be brought up as follows:
+
+    # Assume app.apk is in /tmp
+    docker run --privileged -d -e DEVICE="Samsung Galaxy S6" --volume /tmp:/APK \
+         --name android_em budtmo/docker-android-x86-8.1
+
+    docker exec android_em adb wait-for-device 
+    docker exec android_em adb install /APK/app.apk

README_CUSTOM_CONFIG.md

@@ -3,7 +3,7 @@ Proxy
 
 You can enable proxy inside container by passing following environment variables:
 
-- HTTP_PROXY="\<language>docker\_bridge\_ip\_address>"
+- HTTP_PROXY="\<docker\_bridge\_ip\_address>"
 - HTTPS_PROXY="\<docker\_bridge\_ip\_address>"
 - NO_PROXY="localhost"
 
@@ -15,13 +15,20 @@ You can change the language setting of Android Emulator on the fly by passing fo
 - LANGUAGE="\<language>"
 - COUNTRY="\<country>"
 
+Camera
+------
+
+Passing following environment variable to be able to connect laptop / pc camera to Android emulator:
+
+- EMULATOR_ARGS="-camera-back webcam0"
+
 Custom Emulator Arguments
 -------------------------
 
 If you want to add more arguments for running emulator, you can ***pass an environment variable EMULATOR_ARGS*** while running docker command.
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e EMULATOR_ARGS="-no-snapshot-load -partition-size 512" --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" -e EMULATOR_ARGS="-no-snapshot-load -partition-size 512" --name android-container budtmo/docker-android-x86-8.1
 ```
 
 Back & Restore
@@ -33,7 +40,7 @@ If you want to backup/reuse the avds created with furture upgrades or for replic
 - -v local_backup/android_emulator:/root/android_emulator
 
 ```bash
-docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v local_backup/.android:/root/.android -v local_backup/android_emulator:local_backup/android_emulator -e DEVICE="Nexus 5" --name android-container butomo1989/docker-android-x86-8.1
+docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -v local_backup/.android:/root/.android -v local_backup/android_emulator:local_backup/android_emulator -e DEVICE="Nexus 5" --name android-container budtmo/docker-android-x86-8.1
 ```
 
 For the first run, this will create a new avd and all the changes will be accessible in the `local_backup` directory. Now for all future runs, it will reuse the avds. Even this should work with new releases of `docker-android`

README_GENYMOTION.md

@@ -1,9 +1,11 @@
-Genymotion
-----------
+Genymotion Cloud
+----------------
 
-You can easily scale your Appium tests on Genymotion Android virtual devices in the cloud. 
+![Genymotion](images/logo_genymotion.png)
 
-1. Using Genymotion Cloud
+You can easily scale your Appium tests on Genymotion Android virtual devices in the cloud. They are available on SaaS or as virtual images on AWS, GCP or Alibaba Cloud.
+
+1. On SaaS <br />
 	Use [device.json](genymotion/example/sample_devices/devices.json) to define the device to start. You can specify the port on which the device will start so you don't need to change the device name in your tests every time you need to run those tests. Then run following command
 
 	```bash
@@ -11,18 +13,14 @@ You can easily scale your Appium tests on Genymotion Android virtual devices in
 	export PASS="xxx"
 	export LICENSE="xxx"
 
-	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -e TYPE=genycloud -e USER=$USER -e PASS=$PASS -e LICENSE=$LICENSE butomo1989/docker-android-genymotion
+	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -e TYPE=SaaS -e USER=$USER -e PASS=$PASS -e LICENSE=$LICENSE budtmo/docker-android-genymotion
 	```
 
-<p align="center">
-   <a href="https://youtu.be/jXhUEyaVeMY"><img src="./images/Genymotion_cloud.png" alt="Docker-Android supports Genymotion Cloud" width="600"></a>
-</p>
-
-2. Using Genymotion on AWS
+2. On PaaS (AWS) <br />
 	Use [aws.json](genymotion/example/sample_devices/aws.json) to define configuration of EC2 instance and run following command:
 
 	```bash
-	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -v ~/.aws:/root/.aws -e TYPE=aws butomo1989/docker-android-genymotion
+	docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -v ~/.aws:/root/.aws -e TYPE=aws budtmo/docker-android-genymotion
 	```
 
 You can also use [this docker-compose file](genymotion/example/geny.yml). 

README_VMWARE.md

@@ -65,7 +65,7 @@ The following instructions are used for OS X. You'll need [docker-machine-parall
 5. You may now run a docker container
     5.1. Let's run a docker image for an emulator with x86 processor.
     ```bash
-    docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container butomo1989/docker-android-x86-8.1
+    docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -e DEVICE="Samsung Galaxy S6" --name android-container budtmo/docker-android-x86-8.1
     ```
 
     When the services inside this docker container are running, connect to http://10.211.55.3:6080/vnc.html (the IP we got when the docker machine was created) and login. The emulator with x86 processor should be running on screen.

aks-terraform/README.md

@@ -0,0 +1,86 @@
+# Kubernetes & Azure (AKS, Terraform, Kompose, Kubectl, Azure CLI)
+
+  - Azure CLI configuration
+  - Infrastructure as code for Azure
+  - Generating Kubernetes configuration files with Kompose (Services, Deployments, Pods & Persistent volumes)
+  - Terraform with Azure Provider
+  - Kubectl configuration
+
+## Setting up Azure CLI 
+
+ - Install Azure CLI -> https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest
+ - Execute ```sh $ az login ``` and authenticate with your Azure account
+ - Execute ```sh $ az account show --query "{subscriptionId:id, tenantId:tenantId"  ``` . Then copy subscriptionId and tenantId
+ - Execute ```sh $ az account set --subscription="${SUBSCRIPTION_ID}" ``` . Replace ${SUBSCRIPTION_ID} for your subscriptionId copied
+
+## Create infrastucture in Azure (AKS Service with node master)
+
+Terraform version >= v0.11.7
+
+ - Install Terraform -> https://www.terraform.io/downloads.html
+ - Edit vars with Azure Account values in ```sh terraform.tfvars ```
+ - After that:
+
+ ```sh
+ $ terraform init
+ $ terraform plan
+ $ terraform apply
+ ```
+
+## Setting up Kubectl with Azure account
+
+ - For apply Kubernetes files:
+
+ First configurate azure-cli with Azure account and install kubernetes tools with az: 
+
+ ```sh 
+ $ az aks install-cli 
+ ```
+
+ Then log in in to the Azure Container Registry (if you're using it, but dockerhub or other):
+
+ ```sh
+ $ az acr login
+ ```
+
+ After that, connect to cluster with Kubectl:
+
+ ```sh
+ $  az aks get-credentials --resource-group docker-android --name k8s-docker-android
+ ``` 
+
+## Running with custom K8s files (Recommended)
+
+ - You can use this approach or Kompose (Next 2 steps)
+
+ ```sh
+ $ kubectl create -f volumes.yaml
+ $ kubectl create -f services_deployments.yaml
+ ```
+
+## Generate Kube files with Kompose
+
+ - Install Kompose -> https://github.com/kubernetes/kompose
+
+ Kompose version: >= 1.1.0
+
+ - For convert to Kompose:
+
+ ```sh
+ $ cd kompose
+ $ kompose convert -f ../kompose.yml
+ ```
+
+## Execute Kube files (Kompose)
+
+ - First create Persistent Volume Claims, then Services; finally Deployments files. For example:
+
+ ```sh 
+ $ cd kompose
+ $ kubectl create -f nexus-7.1.1-claim0-persistentvolumeclaim.yaml 
+ $ kubectl create -f nexus-7.1.1-claim1-persistentvolumeclaim.yaml 
+ $ kubectl create -f nexus-7.1.1-service.yaml 
+ $ kubectl create -f nexus-7.1.1-deployment.yaml 
+ ```
+
+

aks-terraform/kompose.yml

@@ -0,0 +1,114 @@
+# Note: It requires docker-compose 1.13.0
+#
+# Usage: docker-compose up -d
+version: "3"
+
+services:
+  # Selenium hub
+  selenium_hub:
+    image: selenium/hub:3.14.0-curium
+    ports:
+      - 4444:4444
+
+  # There is a bug for using appium. Issue: https://github.com/butomo1989/docker-android/issues/73
+  # Real devices
+  #real_device:
+  #  image: butomo1989/docker-android-real-device
+  #  privileged: true
+  #  depends_on:
+  #    - selenium_hub
+  #  ports:
+  #    - 6080:6080
+  #  volumes:
+  #    - ./video-real-device:/tmp/video
+  #    - /dev/bus/usb:/dev/bus/usb
+  #    - ~/.android:/root/.android
+  #  environment:
+  #    - CONNECT_TO_GRID=true
+  #    - APPIUM=true
+  #    - SELENIUM_HOST=selenium_hub
+  #    - AUTO_RECORD=true
+  #    - BROWSER_NAME=chrome
+
+  # Using Appium Docker Android  
+  real_device:
+    image: appium/appium
+    depends_on:
+      - selenium_hub
+    network_mode: "service:selenium_hub"
+    privileged: true
+    volumes:
+      - /dev/bus/usb:/dev/bus/usb
+      - ~/.android:/root/.android
+      - ../example/sample_apk:/root/tmp
+    environment:
+      - CONNECT_TO_GRID=true
+      - SELENIUM_HOST=selenium_hub
+      # Enable it for msite testing
+      #- BROWSER_NAME=chrome
+
+  # Docker-Android for Android application testing
+  nexus_7.1.1:
+    image: butomo1989/docker-android-x86-7.1.1
+    privileged: true
+    # Increase scale number if needed
+    #scale: 1
+    depends_on:
+      - selenium_hub
+      - real_device
+    ports:
+      - 6080
+    # Change path of apk that you want to test. I use sample_apk that I provide in folder "example"
+    volumes:
+      - ../example/sample_apk:/root/tmp/sample_apk
+      - ../video-nexus_7.1.1:/tmp/video
+    environment:
+      - DEVICE=Nexus 5
+      - CONNECT_TO_GRID=true
+      - APPIUM=true
+      - SELENIUM_HOST=selenium_hub
+      - AUTO_RECORD=true
+
+  # Docker-Android for mobile website testing with chrome browser
+  # Chrome browser exists only for version 7.0 and 7.1.1
+  samsung_galaxy_web_7.1.1:
+    image: butomo1989/docker-android-x86-8.1
+    privileged: true
+    # Increase scale number if needed
+    #scale: 1
+    depends_on: 
+      - selenium_hub
+      - real_device
+    ports:
+      - 6080
+    volumes:
+      - ../video-samsung_7.1.1:/tmp/video
+    environment:
+      - DEVICE=Samsung Galaxy S6
+      - CONNECT_TO_GRID=true
+      - APPIUM=true
+      - SELENIUM_HOST=selenium_hub
+      - MOBILE_WEB_TEST=true
+      - AUTO_RECORD=true
+
+  # Docker-Android for mobile website testing with default browser
+  # Default browser exists only for version 5.0.1, 5.1.1 and 6.0
+  samsung_galaxy_web_5.1.1:
+    image: butomo1989/docker-android-x86-5.1.1
+    privileged: true
+    # Increase scale number if needed
+    #scale: 1
+    depends_on:
+      - selenium_hub
+      - real_device
+    ports:
+      - 6080
+    volumes:
+      - ../video-samsung_5.1.1:/tmp/video
+    environment:
+      - DEVICE=Samsung Galaxy S6
+      - CONNECT_TO_GRID=true
+      - APPIUM=true
+      - SELENIUM_HOST=selenium_hub
+      - MOBILE_WEB_TEST=true
+      - AUTO_RECORD=true

aks-terraform/kompose/nexus-7.1.1-claim0-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: nexus-7.1.1-claim0
+  name: nexus-7.1.1-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

aks-terraform/kompose/nexus-7.1.1-claim1-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: nexus-7.1.1-claim1
+  name: nexus-7.1.1-claim1
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

aks-terraform/kompose/nexus-7.1.1-deployment.yaml

@@ -0,0 +1,53 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: nexus-7.1.1
+  name: nexus-7.1.1
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: nexus-7.1.1
+    spec:
+      containers:
+      - env:
+        - name: APPIUM
+          value: "true"
+        - name: AUTO_RECORD
+          value: "true"
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: DEVICE
+          value: Nexus 5
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: butomo1989/docker-android-x86-7.1.1
+        name: nexus-7.1.1
+        ports:
+        - containerPort: 6080
+        resources: {}
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /root/tmp/sample_apk
+          name: nexus-7.1.1-claim0
+        - mountPath: /tmp/video
+          name: nexus-7.1.1-claim1
+      restartPolicy: Always
+      volumes:
+      - name: nexus-7.1.1-claim0
+        persistentVolumeClaim:
+          claimName: nexus-7.1.1-claim0
+      - name: nexus-7.1.1-claim1
+        persistentVolumeClaim:
+          claimName: nexus-7.1.1-claim1
+status: {}

aks-terraform/kompose/nexus-7.1.1-service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: nexus-7.1.1
+  name: nexus-7.1.1
+spec:
+  ports:
+  - name: "6080"
+    port: 6080
+    targetPort: 6080
+  selector:
+    io.kompose.service: nexus-7.1.1
+status:
+  loadBalancer: {}

aks-terraform/kompose/real-device-claim0-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device-claim0
+  name: real-device-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

aks-terraform/kompose/real-device-claim1-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device-claim1
+  name: real-device-claim1
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

aks-terraform/kompose/real-device-claim2-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device-claim2
+  name: real-device-claim2
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

aks-terraform/kompose/real-device-deployment.yaml

@@ -0,0 +1,50 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device
+  name: real-device
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: real-device
+    spec:
+      containers:
+      - env:
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: appium/appium
+        name: real-device
+        resources: {}
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /dev/bus/usb
+          name: real-device-claim0
+        - mountPath: /root/.android
+          name: real-device-claim1
+        - mountPath: /root/tmp
+          name: real-device-claim2
+      restartPolicy: Always
+      volumes:
+      - name: real-device-claim0
+        persistentVolumeClaim:
+          claimName: real-device-claim0
+      - name: real-device-claim1
+        persistentVolumeClaim:
+          claimName: real-device-claim1
+      - name: real-device-claim2
+        persistentVolumeClaim:
+          claimName: real-device-claim2
+status: {}

aks-terraform/kompose/real-device-service.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: real-device
+  name: real-device
+spec:
+  clusterIP: None
+  ports:
+  - name: headless
+    port: 55555
+    targetPort: 0
+  selector:
+    io.kompose.service: real-device
+status:
+  loadBalancer: {}

aks-terraform/kompose/samsung-galaxy-web-5.1.1-claim0-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-5.1.1-claim0
+  name: samsung-galaxy-web-5.1.1-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

aks-terraform/kompose/samsung-galaxy-web-5.1.1-deployment.yaml

@@ -0,0 +1,50 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-5.1.1
+  name: samsung-galaxy-web-5.1.1
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: samsung-galaxy-web-5.1.1
+    spec:
+      containers:
+      - env:
+        - name: APPIUM
+          value: "true"
+        - name: AUTO_RECORD
+          value: "true"
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: DEVICE
+          value: Samsung Galaxy S6
+        - name: MOBILE_WEB_TEST
+          value: "true"
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: butomo1989/docker-android-x86-5.1.1
+        name: samsung-galaxy-web-5.1.1
+        ports:
+        - containerPort: 6080
+        resources: {}
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /tmp/video
+          name: samsung-galaxy-web-5.1.1-claim0
+      restartPolicy: Always
+      volumes:
+      - name: samsung-galaxy-web-5.1.1-claim0
+        persistentVolumeClaim:
+          claimName: samsung-galaxy-web-5.1.1-claim0
+status: {}

aks-terraform/kompose/samsung-galaxy-web-5.1.1-service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-5.1.1
+  name: samsung-galaxy-web-5.1.1
+spec:
+  ports:
+  - name: "6080"
+    port: 6080
+    targetPort: 6080
+  selector:
+    io.kompose.service: samsung-galaxy-web-5.1.1
+status:
+  loadBalancer: {}

aks-terraform/kompose/samsung-galaxy-web-7.1.1-claim0-persistentvolumeclaim.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-7.1.1-claim0
+  name: samsung-galaxy-web-7.1.1-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}

aks-terraform/kompose/samsung-galaxy-web-7.1.1-deployment.yaml

@@ -0,0 +1,50 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-7.1.1
+  name: samsung-galaxy-web-7.1.1
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: samsung-galaxy-web-7.1.1
+    spec:
+      containers:
+      - env:
+        - name: APPIUM
+          value: "true"
+        - name: AUTO_RECORD
+          value: "true"
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: DEVICE
+          value: Samsung Galaxy S6
+        - name: MOBILE_WEB_TEST
+          value: "true"
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: butomo1989/docker-android-x86-8.1
+        name: samsung-galaxy-web-7.1.1
+        ports:
+        - containerPort: 6080
+        resources: {}
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /tmp/video
+          name: samsung-galaxy-web-7.1.1-claim0
+      restartPolicy: Always
+      volumes:
+      - name: samsung-galaxy-web-7.1.1-claim0
+        persistentVolumeClaim:
+          claimName: samsung-galaxy-web-7.1.1-claim0
+status: {}

aks-terraform/kompose/samsung-galaxy-web-7.1.1-service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: samsung-galaxy-web-7.1.1
+  name: samsung-galaxy-web-7.1.1
+spec:
+  ports:
+  - name: "6080"
+    port: 6080
+    targetPort: 6080
+  selector:
+    io.kompose.service: samsung-galaxy-web-7.1.1
+status:
+  loadBalancer: {}

aks-terraform/kompose/selenium-hub-deployment.yaml

@@ -0,0 +1,27 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: selenium-hub
+  name: selenium-hub
+spec:
+  replicas: 1
+  strategy: {}
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: selenium-hub
+    spec:
+      containers:
+      - image: selenium/hub:3.14.0-curium
+        name: selenium-hub
+        ports:
+        - containerPort: 4444
+        resources: {}
+      restartPolicy: Always
+status: {}

aks-terraform/kompose/selenium-hub-service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../kompose.yml
+    kompose.version: 1.1.0 (36652f6)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: selenium-hub
+  name: selenium-hub
+spec:
+  ports:
+  - name: "4444"
+    port: 4444
+    targetPort: 4444
+  selector:
+    io.kompose.service: selenium-hub
+status:
+  loadBalancer: {}

aks-terraform/main.tf

@@ -0,0 +1,48 @@
+
+resource "azurerm_container_service" "container_service" {
+  name                   = "k8s-docker-android"
+  resource_group_name    = "${var.resource_group_name}"
+  location               = "${var.resource_group_location}"
+  orchestration_platform = "Kubernetes"
+
+  master_profile {
+    count      = "${var.master_count}"
+    dns_prefix = "${var.dns_name_prefix}-master"
+  }
+
+  agent_pool_profile {
+    name       = "agentpools"
+    count      = "${var.linux_agent_count}"
+    dns_prefix = "${var.dns_name_prefix}-agent"
+    vm_size    = "${var.linux_agent_vm_size}"
+  }
+
+  linux_profile {
+    admin_username = "${var.linux_admin_username}"
+
+    ssh_key {
+      key_data = "${var.linux_admin_ssh_publickey}"
+    }
+  }
+
+  service_principal {
+    client_id     = "${var.service_principal_client_id}"
+    client_secret = "${var.service_principal_client_secret}"
+  }
+
+  diagnostics_profile {
+    enabled = false
+  }
+
+  tags {
+    Source = "K8s with Terraform"
+  }
+}
+
+output "master_fqdn" {
+  value = "${azurerm_container_service.container_service.master_profile.fqdn}"
+}
+
+output "ssh_command_master0" {
+  value = "ssh ${var.linux_admin_username}@${azurerm_container_service.container_service.master_profile.fqdn} -A -p 22"
+}

aks-terraform/provider.tf

@@ -0,0 +1,11 @@
+
+# Use this if you can't specify your credentials in file but you need ingress in the UI console.
+provider "azurerm" {}
+
+#Use this if you can specify your credentials and no more configuration is necessary 
+ #provider "azurerm" {
+ #  subscription_id = "${var.subscription_id}"
+ #  client_id       = "${var.service_principal_client_id}"
+ #  client_secret   = "${var.service_principal_client_secret}"
+ #  tenant_id       = "${var.tenant_id}"
+ #}

aks-terraform/services_deployments.yaml

@@ -0,0 +1,147 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: selenium
+spec:
+  ports:
+  - name: "4444"
+    port: 4444
+    targetPort: 4444
+  selector:
+    app: selenium
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Deployment
+metadata:
+  name: selenium-deployment
+  labels:
+    app: selenium
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: selenium
+    spec:
+      containers:
+      - image: selenium/hub:3.14.0-curium
+        name: selenium-hub
+        ports:
+        - containerPort: 4444
+        resources: {}
+      restartPolicy: Always
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: real-device
+spec:
+  clusterIP: None
+  ports:
+  - name: headless
+    port: 55555
+    targetPort: 0
+  selector:
+    app: real-device
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Deployment
+metadata:
+  labels:
+    app: real-device
+  name: real-device
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: real-device
+    spec:
+      containers:
+      - env:
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: appium/appium
+        name: real-device
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /dev/bus/usb
+          name: real-device-claim0
+        - mountPath: /root/.android
+          name: real-device-claim1
+        - mountPath: /root/tmp
+          name: real-device-claim2
+      restartPolicy: Always
+      volumes:
+      - name: real-device-claim0
+        persistentVolumeClaim:
+          claimName: real-device-claim0
+      - name: real-device-claim1
+        persistentVolumeClaim:
+          claimName: real-device-claim1
+      - name: real-device-claim2
+        persistentVolumeClaim:
+          claimName: real-device-claim2
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: nexus-7.1.1
+spec:
+  ports:
+  - name: "6080"
+    port: 6080
+    targetPort: 6080
+  selector:
+    app: nexus-7.1.1
+  type: LoadBalancer
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: nexus-7.1.1
+  name: nexus-7.1.1
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: nexus-7.1.1
+    spec:
+      containers:
+      - env:
+        - name: APPIUM
+          value: "true"
+        - name: AUTO_RECORD
+          value: "true"
+        - name: CONNECT_TO_GRID
+          value: "true"
+        - name: DEVICE
+          value: Nexus 5
+        - name: SELENIUM_HOST
+          value: selenium_hub
+        image: butomo1989/docker-android-x86-7.1.1
+        name: nexus-7.1.1
+        ports:
+        - containerPort: 6080
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /root/tmp/sample_apk
+          name: nexus-7.1.1-claim0
+        - mountPath: /tmp/video
+          name: nexus-7.1.1-claim1
+      restartPolicy: Always
+      volumes:
+      - name: nexus-7.1.1-claim0
+        persistentVolumeClaim:
+          claimName: nexus-7.1.1-claim0
+      - name: nexus-7.1.1-claim1
+        persistentVolumeClaim:
+          claimName: nexus-7.1.1-claim1

aks-terraform/terraform.tfvars

@@ -0,0 +1,19 @@
+
+resource_group_name = "docker-android"
+resource_group_location = "West US"
+dns_name_prefix = "docker-android"
+linux_agent_count = "1"
+
+#Only use Dv3 or Ev3 series
+linux_agent_vm_size = "Standard_D2_v3"
+
+linux_admin_username = "(Insert any username here!)"
+linux_admin_ssh_publickey = "(Insert ssh key here!)"
+master_count = "1"
+
+
+# Azure credentials
+service_principal_client_id = "(Insert principal key client id here!)"
+service_principal_client_secret = "(Insert principal key client secret here!)"
+subscription_id = "(Insert subscription id here!)"
+tenant_id = "(Insert tenant id here!)"

aks-terraform/variables.tf

@@ -0,0 +1,62 @@
+variable "resource_group_name" {
+  type        = "string"
+  description = "Name of the azure resource group."
+}
+
+variable "resource_group_location" {
+  type        = "string"
+  description = "Location of the azure resource group."
+}
+
+variable "dns_name_prefix" {
+  type        = "string"
+  description = "Sets the domain name prefix for the cluster. The suffix 'master' will be added to address the master agents and the suffix 'agent' will be added to address the linux agents."
+}
+
+variable "linux_agent_count" {
+  type        = "string"
+  default     = "1"
+  description = "The number of Kubernetes linux agents in the cluster. Allowed values are 1-100 (inclusive). The default value is 1."
+}
+
+variable "linux_agent_vm_size" {
+  type        = "string"
+  default     = "Standard_D2_v2"
+  description = "The size of the virtual machine used for the Kubernetes linux agents in the cluster."
+}
+
+variable "linux_admin_username" {
+  type        = "string"
+  description = "User name for authentication to the Kubernetes linux agent virtual machines in the cluster."
+}
+
+variable "linux_admin_ssh_publickey" {
+  type        = "string"
+  description = "Configure all the linux virtual machines in the cluster with the SSH RSA public key string. The key should include three parts, for example 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'"
+}
+
+variable "master_count" {
+  type        = "string"
+  default     = "1"
+  description = "The number of Kubernetes masters for the cluster. Allowed values are 1, 3, and 5. The default value is 1."
+}
+
+variable "service_principal_client_id" {
+  type        = "string"
+  description = "The client id of the azure service principal used by Kubernetes to interact with Azure APIs."
+}
+
+variable "service_principal_client_secret" {
+  type        = "string"
+  description = "The client secret of the azure service principal used by Kubernetes to interact with Azure APIs."
+}
+
+variable "subscription_id" {
+  type        = "string"
+  description = "Your Azure subscription"
+}
+
+variable "tenant_id" {
+  type        = "string"
+  description = "Your Azure Tenant id"
+}

aks-terraform/volumes.yaml

@@ -0,0 +1,69 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: real-device-claim0
+  name: real-device-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: real-device-claim1
+  name: real-device-claim1
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: real-device-claim2
+  name: real-device-claim2
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: nexus-7.1.1-claim0
+  name: nexus-7.1.1-claim0
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    app: nexus-7.1.1-claim1
+  name: nexus-7.1.1-claim1
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi

docker-compose.yml

@@ -10,10 +10,10 @@ services:
     ports:
       - 4444:4444
 
-  # There is a bug for using appium. Issue: https://github.com/butomo1989/docker-android/issues/73
+  # There is a bug for using appium. Issue: https://github.com/budtmo/docker-android/issues/73
   # Real devices
   #real_device:
-  #  image: butomo1989/docker-android-real-device
+  #  image: budtmo/docker-android-real-device
   #  privileged: true
   #  depends_on:
   #    - selenium_hub
@@ -49,7 +49,7 @@ services:
 
   # Docker-Android for Android application testing
   nexus_7.1.1:
-    image: butomo1989/docker-android-x86-7.1.1
+    image: budtmo/docker-android-x86-7.1.1
     privileged: true
     # Increase scale number if needed
     scale: 1
@@ -72,7 +72,7 @@ services:
   # Docker-Android for mobile website testing with chrome browser
   # Chrome browser exists only for version 7.0 and 7.1.1
   samsung_galaxy_web_7.1.1:
-    image: butomo1989/docker-android-x86-8.1
+    image: budtmo/docker-android-x86-8.1
     privileged: true
     # Increase scale number if needed
     scale: 1
@@ -94,7 +94,7 @@ services:
   # Docker-Android for mobile website testing with default browser
   # Default browser exists only for version 5.0.1, 5.1.1 and 6.0
   samsung_galaxy_web_5.1.1:
-    image: butomo1989/docker-android-x86-5.1.1
+    image: budtmo/docker-android-x86-5.1.1
     privileged: true
     # Increase scale number if needed
     scale: 1

docker.tf

@@ -0,0 +1,44 @@
+provider "docker" {
+	host 	= "unix:///var/run/docker.sock"
+}
+
+resource "docker_image" "selenium_hub_img" {
+	name 	= "selenium/hub:3.14.0-curium"
+}
+
+resource "docker_image" "docker_android_img" {
+	name 	= "budtmo/docker-android-x86-8.1:latest"
+}
+
+resource "docker_network" "private_network" {
+	name 	= "private_network"
+}
+
+resource "docker_container" "selenium_hub_con" {
+	image 		= "${docker_image.selenium_hub_img.latest}"
+	name  		= "selenium_hub_con"
+	networks    = ["${docker_network.private_network.id}"]
+	ports {
+		internal = 4444
+		external = 4444
+	}
+}
+
+resource "docker_container" "samsung_s6_con" {
+	image 		= "${docker_image.docker_android_img.latest}"
+	name  		= "samsung_s6_con"
+	privileged	= true
+	depends_on	= ["docker_container.selenium_hub_con"]
+	networks  	= ["${docker_network.private_network.id}"]
+	ports {
+		internal = 6080
+		external = 6080
+	}
+	env = [
+		"DEVICE=Samsung Galaxy S6", 
+		"CONNECT_TO_GRID=true",
+		"APPIUM=true",
+		"MOBILE_WEB_TEST=true",
+		"AUTO_RECORD=true"
+	]
+}

docker/Emulator_x86

@@ -1,4 +1,4 @@
-FROM appium/appium:1.9.0-p0
+FROM appium/appium:1.10.1-p0
 
 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
 
@@ -92,6 +92,7 @@ ARG BROWSER=android
 ARG CHROME_DRIVER=2.40
 ARG GOOGLE_PLAY_SERVICE=12.8.74
 ARG GOOGLE_PLAY_STORE=11.0.50
+ARG APP_RELEASE_VERSION=1.5-p0
 ENV ANDROID_VERSION=$ANDROID_VERSION \
     API_LEVEL=$API_LEVEL \
     PROCESSOR=$PROCESSOR \
@@ -100,7 +101,13 @@ ENV ANDROID_VERSION=$ANDROID_VERSION \
     BROWSER=$BROWSER \
     CHROME_DRIVER=$CHROME_DRIVER \
     GOOGLE_PLAY_SERVICE=$GOOGLE_PLAY_SERVICE \
-    GOOGLE_PLAY_STORE=$GOOGLE_PLAY_STORE
+    GOOGLE_PLAY_STORE=$GOOGLE_PLAY_STORE \
+    GA=true \
+    GA_ENDPOINT=https://www.google-analytics.com/collect \
+    GA_TRACKING_ID=UA-133466903-1 \
+    GA_API_VERSION="1" \
+    APP_RELEASE_VERSION=$APP_RELEASE_VERSION \
+    APP_TYPE=Emulator
 ENV PATH ${PATH}:${ANDROID_HOME}/build-tools
 
 RUN yes | sdkmanager --licenses && \
@@ -128,7 +135,7 @@ ENV DISPLAY=:0 \
     SCREEN=0 \
     SCREEN_WIDTH=1600 \
     SCREEN_HEIGHT=900 \
-    SCREEN_DEPTH=16 \
+    SCREEN_DEPTH=24+32 \
     LOCAL_PORT=5900 \
     TARGET_PORT=6080 \
     TIMEOUT=1 \

docker/Genymotion

@@ -1,4 +1,4 @@
-FROM appium/appium:1.9.0-p0
+FROM appium/appium:1.10.1-p0
 
 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
 
@@ -80,6 +80,7 @@ RUN  wget -nv -O noVNC.zip "https://github.com/kanaka/noVNC/archive/${NOVNC_SHA}
 # noVNC Default Configurations
 # These Configurations can be changed through -e
 #================================================
+ARG APP_RELEASE_VERSION=1.5-p0
 ENV DISPLAY=:0 \
     SCREEN=0 \
     SCREEN_WIDTH=1600 \
@@ -89,7 +90,13 @@ ENV DISPLAY=:0 \
     TARGET_PORT=6080 \
     TIMEOUT=1 \
     VIDEO_PATH=/tmp/video \
-    LOG_PATH=/var/log/supervisor 
+    LOG_PATH=/var/log/supervisor \
+    GA=true \
+    GA_ENDPOINT=https://www.google-analytics.com/collect \
+    GA_TRACKING_ID=UA-133466903-1 \
+    GA_API_VERSION="1" \
+    APP_RELEASE_VERSION=$APP_RELEASE_VERSION \
+    APP_TYPE=Genymotion
 
 #====================
 # Install genymotion

docker/Real_device

@@ -1,4 +1,4 @@
-FROM appium/appium:1.9.0-p0
+FROM appium/appium:1.10.1-p0
 
 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
 
@@ -71,6 +71,7 @@ RUN  wget -nv -O noVNC.zip "https://github.com/kanaka/noVNC/archive/${NOVNC_SHA}
 # noVNC Default Configurations
 # These Configurations can be changed through -e
 #================================================
+ARG APP_RELEASE_VERSION=1.5-p0
 ENV DISPLAY=:0 \
     SCREEN=0 \
     SCREEN_WIDTH=1600 \
@@ -80,7 +81,13 @@ ENV DISPLAY=:0 \
     TARGET_PORT=6080 \
     TIMEOUT=1 \
     VIDEO_PATH=/tmp/video \
-    LOG_PATH=/var/log/supervisor
+    LOG_PATH=/var/log/supervisor \
+    GA=true \
+    GA_ENDPOINT=https://www.google-analytics.com/collect \
+    GA_TRACKING_ID=UA-133466903-1 \
+    GA_API_VERSION="1" \
+    APP_RELEASE_VERSION=$APP_RELEASE_VERSION \
+    APP_TYPE=Device
 
 #=========================
 # Set default variables

genymotion/example/geny.yml

@@ -11,7 +11,7 @@ services:
       - 4444:4444
 
   # Please stop this container by using docker stop instead of docker-compose stop
-  cloud:
+  saas:
     image: butomo1989/docker-android-genymotion
     depends_on:
       - selenium_hub
@@ -20,7 +20,7 @@ services:
       - $PWD/sample_apk:/root/tmp/sample_apk
       - $PWD/sample_devices:/root/tmp
     environment:
-      - TYPE=genycloud
+      - TYPE=SaaS
       - TEMPLATE=/root/tmp/devices.json
       - USER=$USER
       - PASS=$PASS

genymotion/example/sample_devices/aws.json

@@ -1,12 +1,60 @@
 [
-	{
-		"region": "eu-west-1",
-		"android_version": "6.0",
-		"instance": "t2.small"
-	},
 	{
 		"region": "eu-west-1",
 		"android_version": "8.0",
 		"instance": "t2.small"
+	},
+	{
+		"region": "eu-west-1",
+		"instance": "t2.small",
+		"AMI": "ami-68d78411",
+		"SG": [
+			{
+				"type": "ingress",
+				"configurations": [
+					{
+						"from_port": 22,
+						"to_port": 22,
+						"protocol": "tcp",
+						"cidr_blocks": "0.0.0.0/0"
+					},
+					{
+						"from_port": 80,
+						"to_port": 80,
+						"protocol": "tcp",
+						"cidr_blocks": "0.0.0.0/0"
+					},
+					{
+						"from_port": 443,
+						"to_port": 443,
+						"protocol": "tcp",
+						"cidr_blocks": "0.0.0.0/0"
+					},
+					{
+						"from_port": 51000,
+						"to_port": 51100,
+						"protocol": "tcp",
+						"cidr_blocks": "0.0.0.0/0"
+					},
+					{
+						"from_port": 51000,
+						"to_port": 51100,
+						"protocol": "udp",
+						"cidr_blocks": "0.0.0.0/0"
+					}
+				]
+			},
+			{
+				"type": "egress",
+				"configurations": [
+					{
+						"from_port": 0,
+						"to_port": 65535,
+						"protocol": "udp",
+						"cidr_blocks": "0.0.0.0/0"
+					}
+				]
+			}
+		]
 	}
 ]

genymotion/geny_start.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # This script is needed because of https://www.ctl.io/developers/blog/post/gracefully-stopping-docker-containers/
 
-types=(genycloud aws)
+types=(saas aws)
 
 if [ -z "$TYPE" ]; then
     echo "Please specify one of following types: ${types[@]}"

release.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Bash version should >= 4 to be able to run this script.
 
-IMAGE="butomo1989/docker-android"
+IMAGE="budtmo/docker-android"
 
 if [ -z "$1" ]; then
     read -p "Task (test|build|push|all) : " TASK
@@ -10,7 +10,7 @@ else
 fi
 
 if [ -z "$2" ]; then
-    read -p "Android version (5.0.1|5.1.1|6.0|7.0|7.1.1|8.0|8.1|all): " ANDROID_VERSION
+    read -p "Android version (5.0.1|5.1.1|6.0|7.0|7.1.1|8.0|8.1|9.0|all): " ANDROID_VERSION
 else
     ANDROID_VERSION=$2
 fi
@@ -29,6 +29,7 @@ declare -A list_of_levels=(
         [7.1.1]=25
         [8.0]=26
         [8.1]=27
+        [9.0]=28
 )
 
 # The version of the Chrome browser installed on the Android emulator needs to be known beforehand
@@ -41,6 +42,7 @@ declare -A chromedriver_versions=(
         [7.1.1]="2.28"
         [8.0]="2.31"
         [8.1]="2.33"
+        [9.0]="2.40"
 )
 
 function get_android_versions() {
@@ -161,7 +163,8 @@ function build() {
         echo "[BUILD] Dockerfile: $FILE_NAME"
         docker build -t $image_version --build-arg ANDROID_VERSION=$v --build-arg API_LEVEL=$level \
         --build-arg PROCESSOR=$processor --build-arg SYS_IMG=$sys_img --build-arg IMG_TYPE=$IMG_TYPE \
-        --build-arg BROWSER=$BROWSER --build-arg CHROME_DRIVER=$chrome_driver -f $FILE_NAME .
+        --build-arg BROWSER=$BROWSER --build-arg CHROME_DRIVER=$chrome_driver \
+        --build-arg APP_RELEASE_VERSION=$RELEASE -f $FILE_NAME .
         docker tag $image_version $image_latest
     done
 }

release_geny.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+    read -p "Task (build|push|all) : " TASK
+else
+    TASK=$1
+fi
+
+if [ -z "$2" ]; then
+    read -p "Release version: " RELEASE
+else
+    RELEASE=$2
+fi
+
+IMAGE="budtmo/docker-android"
+FILE_NAME=docker/Genymotion
+
+image_version="$IMAGE-genymotion:$RELEASE"
+image_latest="$IMAGE-genymotion:latest"
+
+function build() {
+  echo "[BUILD] Image name: $image_version and $image_latest"
+  echo "[BUILD] Dockerfile: $FILE_NAME"
+  docker build -t $image_version --build-arg APP_RELEASE_VERSION=$RELEASE -f $FILE_NAME .
+  docker tag $image_version $image_latest
+}
+
+function push() {
+  echo "[PUSH] Image name: $image_version and $image_latest"
+  docker push $image_version
+  docker push $image_latest
+}
+
+case $TASK in
+    build)
+        build
+    ;;
+    push)
+        push
+    ;;
+    all)
+        build
+        push
+    ;;
+    *)
+        echo "Invalid environment! Valid options: test, build, push, all"
+    ;;
+esac

release_real.sh

@@ -12,7 +12,7 @@ else
     RELEASE=$2
 fi
 
-IMAGE="butomo1989/docker-android"
+IMAGE="budtmo/docker-android"
 FILE_NAME=docker/Real_device
 
 image_version="$IMAGE-real-device:$RELEASE"
@@ -21,7 +21,7 @@ image_latest="$IMAGE-real-device:latest"
 function build() {
   echo "[BUILD] Image name: $image_version and $image_latest"
   echo "[BUILD] Dockerfile: $FILE_NAME"
-  docker build -t $image_version -f $FILE_NAME .
+  docker build -t $image_version --build-arg APP_RELEASE_VERSION=$RELEASE -f $FILE_NAME .
   docker tag $image_version $image_latest
 }
 

revert.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-IMAGE_NAME="butomo1989/docker-android"
+IMAGE_NAME="budtmo/docker-android"
 
 if [ -z "$1" ]; then
     read -p "Type : " TYPE

src/app.py

@@ -124,7 +124,8 @@ def appium_run(avd_name: str):
     grid_connect = convert_str_to_bool(str(os.getenv('CONNECT_TO_GRID', False)))
     logger.info('Connect to selenium grid? {connect}'.format(connect=grid_connect))
     if grid_connect:
-        local_ip = os.popen('ifconfig eth0 | grep \'inet addr:\' | cut -d: -f2 | awk \'{ print $1}\'').read().strip()
+        # Ubuntu 16.04 -> local_ip = os.popen('ifconfig eth0 | grep \'inet addr:\' | cut -d: -f2 | awk \'{ print $1}\'').read().strip()
+        local_ip = os.popen('ifconfig eth0 | grep \'inet\' | cut -d: -f2 | awk \'{ print $2}\'').read().strip()
         try:
             mobile_web_test = convert_str_to_bool(str(os.getenv('MOBILE_WEB_TEST', False)))
             appium_host = os.getenv('APPIUM_HOST', local_ip)

src/appium.sh

@@ -22,6 +22,7 @@ function prepare_geny_cloud() {
 	    template=$(get_value '.template')
 	    device=$(get_value '.device')
 	    port=$(get_value '.port')
+	    
 
 	    if [[ $port != null ]]; then
 	    	echo "Starting \"$device\" with template name \"$template\" on port \"$port\"..."
@@ -45,14 +46,118 @@ function prepare_geny_aws() {
 			echo ${row} | base64 --decode | jq -r ${1}
 		}
 
-	    region=$(get_value '.region')
-	    android_version=$(get_value '.android_version')
-	    instance=$(get_value '.instance')
+		region=$(get_value '.region')
+		android_version=$(get_value '.android_version')
+		instance=$(get_value '.instance')
+		ami=$(get_value '.AMI')
+		sg=$(get_value '.SG')
+
+		echo $region
+		echo $android_version
+		echo $instance
+		echo $ami
+		echo $sg
+
+	    #TODO: remove this dirty hack
+		if [[ $android_version == null ]]; then
+			echo "[HACK] Version cannot be empty! version will be added!"
+			android_version="6.0"
+		fi
+
+		#Custom Security Group
+		if [[ $sg != null ]]; then
+			echo "Custom security group is found!"
+			security_group=""
+
+			is_array=$(echo "${sg}" | jq 'if type=="array" then true else false end')
+			if [ $is_array == "true" ]; then
+				echo "New security group with given rules will be created"
+				for i in $(echo "${sg}" | jq -r '.[] | @base64'); do
+					get_value() {
+						echo ${i} | base64 --decode | jq -r ${1}
+					}
+
+					type=$(get_value '.type')
+					configs=$(get_value '.configurations')
 
 
-	    echo $region
-	    echo $android_version
-	    echo $instance
+					for c in $(echo "${configs}" | jq -r '.[] | @base64'); do
+						get_value() {
+							echo ${c} | base64 --decode | jq -r ${1}
+						}
+
+						from_port=$(get_value '.from_port')
+						to_port=$(get_value '.to_port')
+						protocol=$(get_value '.protocol')
+						cidr_blocks=$(get_value '.cidr_blocks')
+						security_group+=$(cat <<_EOF
+
+	$type {
+		from_port	= $from_port
+		to_port		= $to_port
+		protocol	= "$protocol"
+		cidr_blocks	= ["$cidr_blocks"]
+	}
+_EOF
+	)
+					done
+				done
+			else
+				#TODO: remove this dirty hack
+				echo "Given security group will be used!"
+				is_array="false"
+				security_group=$(cat <<_EOF
+	ingress {
+		from_port       = 22
+		to_port         = 22
+		protocol        = "tcp"
+		cidr_blocks     = ["0.0.0.0/0"]
+	}
+_EOF
+)
+			fi
+		else
+			echo "Custom security is not found! It will use default security group!"
+			security_group=$(cat <<_EOF
+	ingress {
+		from_port       = 22
+		to_port         = 22
+		protocol        = "tcp"
+		cidr_blocks     = ["0.0.0.0/0"]
+	}
+	ingress {
+		from_port       = 80
+		to_port         = 80
+		protocol        = "tcp"
+		cidr_blocks     = ["0.0.0.0/0"]
+	}
+	ingress {
+		from_port       = 443
+		to_port         = 443
+		protocol        = "tcp"
+		cidr_blocks     = ["0.0.0.0/0"]
+	}
+	ingress {
+		from_port       = 51000
+		to_port         = 51100
+		protocol        = "tcp"
+		cidr_blocks     = ["0.0.0.0/0"]
+	}
+	ingress {
+		from_port       = 51000
+		to_port         = 51100
+		protocol        = "udp"
+		cidr_blocks     = ["0.0.0.0/0"]
+	}
+	egress {
+		from_port       = 0
+		to_port         = 65535
+		protocol        = "udp"
+		cidr_blocks     = ["0.0.0.0/0"]
+	}
+_EOF
+)
+		fi
 
 	    aws_tf_content=$(cat <<_EOF
 variable "aws_region_$index" {
@@ -61,8 +166,8 @@ variable "aws_region_$index" {
 }
 
 variable "android_version_$index" {
-    type    = "string"
-    default = "$android_version"
+	type    = "string"
+	default = "$android_version"
 }
 
 variable "instance_type_$index" {
@@ -76,19 +181,8 @@ provider "aws" {
 }
 
 resource "aws_security_group" "geny_sg_$index" {
-	provider 			= "aws.provider_$index"
-	ingress {
-		from_port		= 0
-		to_port			= 65535
-		protocol		= "tcp"
-		cidr_blocks		= ["0.0.0.0/0"]
-	}
-	egress {
-		from_port		= 0
-		to_port			= 65535
-		protocol		= "udp"
-		cidr_blocks		= ["0.0.0.0/0"]
-    }
+	provider = "aws.provider_$index"
+	$security_group
 }
 
 data "aws_ami" "geny_aws_$index" {
@@ -110,12 +204,12 @@ resource "aws_key_pair" "geny_key_$index" {
 
 resource "aws_instance" "geny_aws_$index" {
 	provider      = "aws.provider_$index"
-	ami           = "\${data.aws_ami.geny_aws_$index.id}"
+	ami="\${data.aws_ami.geny_aws_$index.id}"
 	instance_type = "\${var.instance_type_$index}"
-	vpc_security_group_ids = ["\${aws_security_group.geny_sg_$index.name}"]
+	vpc_security_group_ids=["\${aws_security_group.geny_sg_$index.name}"]
 	key_name      = "\${aws_key_pair.geny_key_$index.key_name}"
 	tags {
-		Name = "EK-\${data.aws_ami.geny_aws_$index.id}"
+		Name = "DockerAndroid-\${data.aws_ami.geny_aws_$index.id}"
 	}
 	count = 1
 
@@ -136,6 +230,21 @@ output "public_dns_$index" {
 _EOF
 )
 		echo "$aws_tf_content" > /root/aws_tf_$index.tf
+
+		if [[ $ami != null ]]; then
+			echo "Using given AMI!"
+			sed -i "s/.*ami=.*/        ami=\"$ami\"/g" /root/aws_tf_$index.tf
+		else
+			echo "Custom AMI is not found. It will use the latest AMI!"
+		fi
+
+		if [[ $sg != null ]] && [[ $is_array == "false" ]]; then
+			echo "Using given security group: $sg"
+			sed -i "s/.*vpc_security_group_ids=.*/        vpc_security_group_ids=[\"$sg\"]/g" /root/aws_tf_$index.tf
+		fi
+
+		echo "---------------------------------------------------------"
+
 	    ((index++))
 	    ((port++))
 	done
@@ -152,7 +261,7 @@ _EOF
 	echo "Connect to adb remotely"
 	for ((i=index;i>=1;i--)); do	
 		dns=$(./terraform output public_dns_$i)	
-		((sleep ${interval_sleep} && adb connect localhost:${port}) > /dev/null & ssh -i ~/.ssh/id_rsa -oStrictHostKeyChecking=no -q -NL ${port}:localhost:5555 shell@${dns}) &
+		((sleep ${interval_sleep} && adb connect localhost:${port}) > /dev/null & ssh -i ~/.ssh/id_rsa -o ServerAliveInterval=60 -o StrictHostKeyChecking=no -q -NL ${port}:localhost:5555 shell@${dns}) &
 		((port--))
 		time_sleep=$((time_sleep+interval_sleep))
 	done
@@ -179,6 +288,31 @@ function run_appium() {
   	$CMD
 }
 
+function ga(){
+	if [ "$GA" = true ]; then
+		echo "Collecting data for improving the project"
+		description="PROCESSOR: ${SYS_IMG}; VERSION: ${ANDROID_VERSION}; DEVICE: ${DEVICE}; APPIUM: ${APPIUM}; SELENIUM: ${CONNECT_TO_GRID}; MOBILE_TEST: ${MOBILE_WEB_TEST}"
+		random_user=$(cat /proc/version 2>&1 | sed -e 's/ /_/g' | sed -e 's/[()]//g' | sed -e 's/@.*_gcc_version/_gcc/g' | sed -e 's/__/_/g' | sed -e 's/Linux_version_//g' | sed -e 's/generic_build/genb/g')
+		random_user="${APP_RELEASE_VERSION}_${random_user}"
+		payload=(
+			--data v=${GA_API_VERSION}
+			--data aip=1
+			--data tid="${GA_TRACKING_ID}"
+			--data cid="${random_user}"
+			--data t="event"
+			--data ec="${APP_TYPE}"
+			--data ea="${random_user}"
+			--data el="${description}"
+			--data an="docker-android"
+			--data av="${APP_RELEASE_VERSION}"
+		)
+		curl ${GA_ENDPOINT} "${payload[@]}" --silent 
+	else
+		echo "Nothing to do"
+	fi
+}
+
+ga
 if [ "$REAL_DEVICE" = true ]; then
 	echo "Using real device"
 	run_appium
@@ -187,7 +321,7 @@ elif [ "$GENYMOTION" = true ]; then
 	echo "${types[@]}"
 	case $TYPE in
 	"${types[0]}" )
-		echo "Using Genymotion-Cloud"
+		echo "Using Genymotion-Cloud (SaaS)"
 		prepare_geny_cloud
 		run_appium
 		;;

src/port_forward.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
-ip=$(ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}')
+#Ubuntu 16.04 -> ip=$(ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}')
+ip=$(ifconfig eth0 | grep 'inet' | cut -d: -f2 | awk '{ print $2}')
 socat tcp-listen:5554,bind=$ip,fork tcp:127.0.0.1:5554 &
 socat tcp-listen:5555,bind=$ip,fork tcp:127.0.0.1:5555

src/tests/unit/test_app.py

@@ -64,6 +64,19 @@ class TestApp(TestCase):
             self.assertTrue(mocked_subprocess.called)
             self.assertTrue(mocked_appium.called)
 
+    @mock.patch('src.app.prepare_avd')
+    @mock.patch('builtins.open')
+    @mock.patch('subprocess.Popen')
+    def test_run_with_appium_and_relaxed_security(self, mocked_avd, mocked_open, mocked_subprocess):
+        with mock.patch('src.app.appium_run') as mocked_appium:
+            os.environ['APPIUM'] = str(True)
+            os.environ['RELAXED_SECURITY'] = str(True)
+            app.run()
+            self.assertTrue(mocked_avd.called)
+            self.assertTrue(mocked_open.called)
+            self.assertTrue(mocked_subprocess.called)
+            self.assertTrue(mocked_appium.called)
+
     @mock.patch('src.app.prepare_avd')
     @mock.patch('builtins.open')
     @mock.patch('subprocess.Popen')

travis.sh

@@ -13,6 +13,9 @@ else
     elif [ ! -z "$REAL_DEVICE" ]; then
       echo "[SUPPORT FOR REAL DEVICE: BUILD DOCKER IMAGES AND PUSH THOSE TO DOCKER HUB ]"
       bash release_real.sh all $TRAVIS_TAG
+    elif [ ! -z "$GENYMOTION" ]; then
+      echo "[SUPPORT FOR GENYMOTION: BUILD DOCKER IMAGES AND PUSH THOSE TO DOCKER HUB ]"
+      bash release_genymotion.sh all $TRAVIS_TAG
     fi
     echo "Log out of docker hub"
     docker logout