Deleted old video

Renamed
Merge branch 'master' of github.com:butomo1989/docker-android
2026-07-31 04:07:25 +00:00 · 2019-01-30 15:01:28 +01:00 · 2019-01-30 14:58:31 +01:00 · 2019-01-16 10:49:17 +01:00 · 2019-01-16 10:49:05 +01:00 · 2019-01-16 09:36:35 +01:00
58 changed files with 1998 additions and 257 deletions
@@ -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

@@ -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)
@@ -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.
@@ -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)
@@ -1 +1 @@
-Budi Utomo <budi.ut.1989@gmail.com>
+Budi Utomo <budtmo.os@gmail.com>
@@ -2,24 +2,20 @@
  <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)
-[![Docker Pulls](https://img.shields.io/docker/pulls/butomo1989/docker-android-x86-7.1.1.svg?style=flat-square&style=plastic)](https://hub.docker.com/r/butomo1989/docker-android-x86-7.1.1/)
-[![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)

 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]   

-Purpose
-------
+Purposes
+--------

 1. Run UI tests for mobile websites with [appium]
 2. Build Android project and run unit tests with the latest build-tools
@@ -36,22 +32,24 @@ Advantages compare with other docker-android projects
 4. Ability to control emulator from outside container by using adb connect
 5. Support real devices with screen mirroring
 6. Ability to record video during test execution for debugging
-7. Open source with more features coming
+7. Integrated with other cloud solutions, e.g. [Genymotion Cloud](https://www.genymotion.com/cloud/)
+8. Open source with more features coming

 List of Docker images
 ---------------------

-|OS   |Android version   |API   |Browser   |Browser version   |Chromedriver version   |Image   |Size   |
+|OS   |Android   |API   |Browser   |Browser version   |Chromedriver   |Image   |Size   |
 |:---|:---|:---|:---|:---|:---|:---|:---|
-|Linux|5.0.1|21|browser|37.0|2.12|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
 ---------------
@@ -73,12 +71,12 @@ Docker is installed in your system.
 Quick Start
 -----------

-1. Run docker-android
+1. Run Docker-Android

 	- 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
@@ -96,110 +94,59 @@ Quick Start

 3. Open ***http://docker-host-ip-address:6080*** from web browser.

-Run Appium Server
-----------------
+Custom configurations
+---------------------

-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
-```
-
-### Connect to Selenium Grid
-
-It is also possible to connect appium server that run inside docker-android with selenium grid by passing following environment variables:
-
- CONNECT\_TO\_GRID=true
- APPIUM_HOST="\<host\_ip\_address>"
- APPIUM_PORT=\<port\_number>
- SELENIUM_HOST="\<host\_ip\_address>"
- SELENIUM_PORT=\<port\_number>
-
-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
-```
-
-### Share Volume
-
-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
-```
-
-### Video Recording
-
-You can deactivate auto_record by changing the value to "False" in docker-compose file. e.g. change value to "False" in this [line].
-
-### Docker-Compose
-
-![][compose]
-
-There is [example of compose file] to run complete selenium grid and docker-android container as nodes. [docker-compose] version [1.13.0] or higher is required to be able to execute that compose file.
-
-```bash
-docker-compose up -d
-```
+[This document](README_CUSTOM_CONFIG.md) contains custom configurations of Docker-Android that you might need, e.g. Proxy, Changing language on fly, etc. 

 Build Android project
 ---------------------

-docker-android can be used for building Android project and executing its unit test. This following steps will illustrate how to build Android project:
+Docker-Android can be used for building Android project and executing its unit test. This following steps will illustrate how to build Android project:

 1. Clone [this sample test project](https://github.com/googlesamples/android-testing).

-	```bash
-	git clone git@github.com:googlesamples/android-testing.git
-	```
+    ```bash
+    git clone git@github.com:googlesamples/android-testing.git
+    ```

 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
+    ```bash
+    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)

-Proxy
-----
+3. Open terminal by clicking right on **noVNC** window >> **Terminal emulator**

-You can enable proxy inside container by passing following environment variables:
+4. To connect to host's adb (make sure your host have adb and connected to the device.) 

- HTTP_PROXY="\<docker\_bridge\_ip\_address>"
- HTTPS_PROXY="\<docker\_bridge\_ip\_address>"
- NO_PROXY="localhost"
+	```
+	$ adb -H host.docker.internal devices
+	```
+	
+	To specify port, just add `-P port_number`

-Relaxed Security
-----
+	```
+	$ 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.  

-Pass environment variable RELAXED_SECURITY=true to disable additional security check to use some advanced features.

-Genymotion
----------
-
-![Genymotion](images/logo_genymotion.png)
-
-Docker-Android supports [Genymotion Cloud]. 
-
-You can easily scale your Appium tests on Genymotion Android virtual devices in the cloud. 
-Use [device.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
-export USER="xxx"
-export PASS="xxx"
-export LICENSE="xxx"
-
-docker run -it --rm -p 4723:4723 -v $PWD/genymotion/example/sample_devices:/root/tmp -e USER=$USER -e PASS=$PASS -e LICENSE=$LICENSE butomo1989/docker-android-genymotion
-```
-
-You can also use [this docker-compose file].
-
-<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>
+Appium and Selenium Grid
+------------------------

+If you want to use Appium and Selenium Grid, you can follow [this document](README_APPIUM_AND_SELENIUM.md). It also contains sample and use cases.

 Control android emulator outside container
 ------------------------------------------
@@ -212,15 +159,6 @@ adb connect <docker-machine-ip-address>:5555

 **Note:** You need to have Android Debug Bridge (adb) installed in your host machine.

-Get rid of unauthorized device popup while connecting to the emulator outside the container
------------------------------------------
-
-In order to connect to the emulator using already generated adbkey on your machine you will need to mount your `.android` folder to the container (this is needed only when you work with emulator based on playstore image):
-
-```
-docker run -v <local Android key directory>:/root/.android/ ...
-```
-
 SMS Simulation
 --------------

@@ -259,76 +197,29 @@ SMS Simulation

 ![][sms]

-How to use docker-android in VMWare or Parallels Desktop
---------------
-The following instructions are used for OS X. You'll need [docker-machine-parallels](https://github.com/Parallels/docker-machine-parallels) to create a virtual machine (vm) with tiny core linux for running docker images. After that, you may start the vm you created for VMWare Fusion or Parallels Desktop and run a docker container inside this vm. If you're going to use the android docker of emulator with x86 processor, setup this vm for nested virtualization and kvm support before you run a docker container.
+Google Play Services and Google Play Store
+------------------------------------------

-1. Install docker-machine-parallels via Homebrew:
-    ```bash
-    $ brew install docker-machine-parallels
-    ```
+Docker-Android contains Google Play Service (v12.8.74) and Google Play Store (v11.0.50). Both applications are downloaded from [apklinker](https://www.apklinker.com/), so please be aware of it in case you use private/company account to that applications.

-2. Create a virtual machine for running docker images based on the virtual machine tool you use
+VMWARE
+------

-    2.1. Create a virtual machine of VMWare Fusion
-    ```bash
-    $ docker-machine create --driver=vmwarefusion vmware-dev
-    ```
+This [document](README_VMWARE.md) shows you how to configure Virtual Machine on VMWARE to be able to run Docker-Android.

-    2.2. Create a virtual machine of Parallels Desktop
-    ```bash
-    $ docker-machine create --driver=parallels prl-dev
-    ```
-    
-    This utility `docker-machine-parallels` will fetch boot2docker.iso to create a vm of VMWare fusion or Parallels Desktop. When the vm is created, you'll see it's booted with VMWare fusion or Parallels Desktop where the network of vm is set to NAT and one IP is assigned. You'll be able to connect to vnc service inside the docker image through that IP. Say it's `10.211.55.3` and we'll use it later.
+Cloud
+-----

-3. Setup the virtual machine for nested virtualization support
+This [document](README_CLOUD.md) contains information about deploying Docker-Android on cloud services.

-    3.1. Shutdown the vm by running the command below in the boot2docker vm before you setup it.
-    ```bash
-    # shutdown -h now
-    ```
+Genymotion
+----------

-    If you use VMWare Fusion, go to menu bar > Vitual Machine > Settings > Processors and Memory, expand Advanced options, and select `Enable hypervisor applications in this virtual machine`.
-    
-    ![Enable nested virtualization for VMWare Fusion](images/vmwarefusion_enable_nested_virtualization.png)
-    
-    If you use Parallels Desktop, open settings screen of that vm and go to `CPU & Memory` under `hardware` tab, expand Advanced settings and select `Enable nested virtualization`.
-    
-    ![Enable nested virtualization for Parallels Desktop](images/parallels_enable_nested_virtualization.png)
+<p align="center">
+  <img id="geny" src="./images/logo_genymotion_and_dockerandroid.png" />
+</p>

-4. Enable kvm inside virtual machine
-    4.1. Run as an account other than root to install kvm packages using tce-load.
-    ```bash
-    # su docker
-    $ tce-load -wi kvm
-    ```
-
-    4.2. Run as root to load kvm module after kvm packages install.
-    ```bash
-    $ sudo modprobe kvm_intel
-    ```
-
-    4.3. Check if the kvm device is loaded.
-    ```bash
-    $ ls /dev/kvm
-    ```
-
-    4.4. Check if your CPU supports hardware virtualization now
-    ```bash
-    $ egrep -c '(vmx|svm)' /proc/cpuinfo
-    ```
-
-    If **0** it means that your CPU doesn't support hardware virtualization.
-    If **1** or more it does - but you still need to make sure that virtualization is enabled in the BIOS.
-
-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
-    ```
-
-    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.
+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
 ---------------
@@ -342,20 +233,16 @@ 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>
 [real device]: <images/real_device.png>
-[compose]: <images/compose.png>
-[line]: <https://github.com/butomo1989/docker-android/blob/master/docker-compose.yml#L70>
-[example of compose file]: <docker-compose.yml>
-[docker-compose]: <https://docs.docker.com/compose/install/>
-[1.13.0]: <https://github.com/docker/compose/releases/tag/1.13.0>
-[Genymotion Cloud]: <https://www.genymotion.com/cloud/>
-[device.json]: <genymotion/example/sample_devices/devices.json>
-[this docker-compose file]: <genymotion/example/geny.yml>
 [adb_connection]: <images/adb_connection.png>
 [sms]: <images/SMS.png>
 [gian christanto]: <https://www.linkedin.com/in/gian-christanto-0b398b131/>
@@ -0,0 +1,54 @@
+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 budtmo/docker-android-x86-8.1
+```
+
+### Share Volume
+
+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 budtmo/docker-android-x86-8.1
+```
+
+### Connect to Selenium Grid
+
+It is also possible to connect appium server that run inside docker-android with selenium grid by passing following environment variables:
+
+- CONNECT\_TO\_GRID=true
+- APPIUM_HOST="\<host\_ip\_address>"
+- APPIUM_PORT=\<port\_number>
+- SELENIUM_HOST="\<host\_ip\_address>"
+- SELENIUM_PORT=\<port\_number>
+
+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 budtmo/docker-android-x86-8.1
+```
+
+### Video Recording
+
+You can deactivate auto_record by changing the value to "False" in docker-compose file. e.g. change value to "False" in this [line](docker-compose.yml#L70).
+
+### Relaxed Security
+
+Pass environment variable RELAXED_SECURITY=true to disable additional security check to use some advanced features.
+
+### Docker-Compose
+
+![][compose]
+
+There is [example of compose file](docker-compose.yml) to run complete selenium grid and docker-android container as nodes. [docker-compose](https://docs.docker.com/compose/install/) version [1.13.0](https://github.com/docker/compose/releases/tag/1.13.0) or higher is required to be able to execute that compose file.
+
+```bash
+docker-compose up -d
+```
+
+[compose]: <images/compose.png>
@@ -0,0 +1,25 @@
+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
@@ -0,0 +1,46 @@
+Proxy
+-----
+
+You can enable proxy inside container by passing following environment variables:
+
+- HTTP_PROXY="\<docker\_bridge\_ip\_address>"
+- HTTPS_PROXY="\<docker\_bridge\_ip\_address>"
+- NO_PROXY="localhost"
+
+Language
+--------
+
+You can change the language setting of Android Emulator on the fly by passing following environment variable:
+
+- 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 budtmo/docker-android-x86-8.1
+```
+
+Back & Restore
+--------------
+
+If you want to backup/reuse the avds created with furture upgrades or for replication, run the container with two extra mounts
+
+- -v local_backup/.android:/root/.android
+- -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 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`
@@ -0,0 +1,26 @@
+Genymotion Cloud
+----------------
+
+![Genymotion](images/logo_genymotion.png)
+
+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
+	export USER="xxx"
+	export PASS="xxx"
+	export LICENSE="xxx"
+
+	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
+	```
+
+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 budtmo/docker-android-genymotion
+	```
+
+You can also use [this docker-compose file](genymotion/example/geny.yml). 
@@ -0,0 +1,71 @@
+VMWare Fusion on OSX
+--------------------
+
+The following instructions are used for OS X. You'll need [docker-machine-parallels](https://github.com/Parallels/docker-machine-parallels) to create a virtual machine (vm) with tiny core linux for running docker images. After that, you may start the vm you created for VMWare Fusion or Parallels Desktop and run a docker container inside this vm. If you're going to use the android docker of emulator with x86 processor, setup this vm for nested virtualization and kvm support before you run a docker container.
+
+1. Install docker-machine-parallels via Homebrew:
+    ```bash
+    $ brew install docker-machine-parallels
+    ```
+
+2. Create a virtual machine for running docker images based on the virtual machine tool you use
+
+    2.1. Create a virtual machine of VMWare Fusion
+    ```bash
+    $ docker-machine create --driver=vmwarefusion vmware-dev
+    ```
+
+    2.2. Create a virtual machine of Parallels Desktop
+    ```bash
+    $ docker-machine create --driver=parallels prl-dev
+    ```
+
+    This utility `docker-machine-parallels` will fetch boot2docker.iso to create a vm of VMWare fusion or Parallels Desktop. When the vm is created, you'll see it's booted with VMWare fusion or Parallels Desktop where the network of vm is set to NAT and one IP is assigned. You'll be able to connect to vnc service inside the docker image through that IP. Say it's `10.211.55.3` and we'll use it later.
+
+3. Setup the virtual machine for nested virtualization support
+
+    3.1. Shutdown the vm by running the command below in the boot2docker vm before you setup it.
+    ```bash
+    # shutdown -h now
+    ```
+
+    If you use VMWare Fusion, go to menu bar > Vitual Machine > Settings > Processors and Memory, expand Advanced options, and select `Enable hypervisor applications in this virtual machine`.
+
+    ![Enable nested virtualization for VMWare Fusion](images/vmwarefusion_enable_nested_virtualization.png)
+
+    If you use Parallels Desktop, open settings screen of that vm and go to `CPU & Memory` under `hardware` tab, expand Advanced settings and select `Enable nested virtualization`.
+
+    ![Enable nested virtualization for Parallels Desktop](images/parallels_enable_nested_virtualization.png)
+
+4. Enable kvm inside virtual machine
+    4.1. Run as an account other than root to install kvm packages using tce-load.
+    ```bash
+    # su docker
+    $ tce-load -wi kvm
+    ```
+
+    4.2. Run as root to load kvm module after kvm packages install.
+    ```bash
+    $ sudo modprobe kvm_intel
+    ```
+
+    4.3. Check if the kvm device is loaded.
+    ```bash
+    $ ls /dev/kvm
+    ```
+
+    4.4. Check if your CPU supports hardware virtualization now
+    ```bash
+    $ egrep -c '(vmx|svm)' /proc/cpuinfo
+    ```
+
+    If **0** it means that your CPU doesn't support hardware virtualization.
+    If **1** or more it does - but you still need to make sure that virtualization is enabled in the BIOS.
+
+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 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.
@@ -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 
+ ```
+
+
@@ -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
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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"
+}
@@ -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}"
+ #}
@@ -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
@@ -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!)"
@@ -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"
+}
@@ -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
@@ -6,14 +6,14 @@ version: "2.2"
 services:
  # Selenium hub
  selenium_hub:
-    image: selenium/hub:3.12.0-americium
+    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
+  # 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
@@ -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"
+	]
+}
@@ -1,4 +1,4 @@
-FROM appium/appium:1.8.1-p2
+FROM appium/appium:1.10.1-p0

 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"

@@ -90,13 +90,24 @@ ARG SYS_IMG=x86
 ARG IMG_TYPE=google_apis
 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 \
    SYS_IMG=$SYS_IMG \
    IMG_TYPE=$IMG_TYPE \
    BROWSER=$BROWSER \
-    CHROME_DRIVER=$CHROME_DRIVER
+    CHROME_DRIVER=$CHROME_DRIVER \
+    GOOGLE_PLAY_SERVICE=$GOOGLE_PLAY_SERVICE \
+    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 && \
@@ -110,6 +121,12 @@ RUN wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/${CHROME
 && unzip -x chrome.zip \
 && rm chrome.zip

+#================================================================
+# Download Google Play Services APK and Play Store from apklinker
+#================================================================
+Run wget -nv -O google_play_services.apk "https://www.apklinker.com/wp-content/uploads/uploaded_apk/5b5155e5ef4f8/com.google.android.gms_${GOOGLE_PLAY_SERVICE}-020700-204998136_12874013_MinAPI21_(x86)(nodpi)_apklinker.com.apk"
+Run wget -nv -O google_play_store.apk "https://www.apklinker.com/wp-content/uploads/uploaded_apk/5b632b1164e31/com.android.vending_${GOOGLE_PLAY_STORE}-all-0-PR-206665793_81105000_MinAPI16_(armeabi,armeabi-v7a,mips,mips64,x86,x86_64)(240,320,480dpi)_apklinker.com.apk"
+
 #================================================
 # noVNC Default Configurations
 # These Configurations can be changed through -e
@@ -1,4 +1,4 @@
-FROM appium/appium:1.8.1-p2
+FROM appium/appium:1.10.1-p0

 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"

@@ -16,6 +16,8 @@ WORKDIR /root
 #   Process manager
 # socat
 #   Port forwarder
+# keychain
+#   ssh-key creator
 #------------------
 # Genymotion spec
 #------------------
@@ -46,6 +48,7 @@ RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \
    xterm \ 
    supervisor \
    socat \
+    keychain \
    bzip2 \
    x11vnc \
    openbox \
@@ -77,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 \
@@ -86,13 +90,19 @@ 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
 #====================
+RUN echo | ssh-keygen -q
 ARG GENYMOTION_VERSION=2.12.1
-
 ENV GENYMOTION=true \
    GENYMOTION_VERSION=$GENYMOTION_VERSION \
    PATH="${PATH}:/opt/genymobile/genymotion/" \
@@ -101,7 +111,17 @@ RUN wget -nv -O genymotion.bin "https://dl.genymotion.com/releases/genymotion-${
 && chmod +x ./genymotion.bin \
 && yes | ./genymotion.bin \
 && rm genymotion.bin
-COPY genymotion/generate_config.sh genymotion/geny_start.sh /root/
+COPY genymotion/generate_config.sh genymotion/geny_start.sh genymotion/enable_adb.sh /root/
+
+#===================
+# Install Terraform
+#===================
+ARG TERRAFORM_VERSION=0.11.7
+
+ENV TERRAFORM_VERSION=$TERRAFORM_VERSION
+RUN wget -nv -O terraform.zip "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" \
+ && unzip -x terraform.zip \
+ && rm terraform.zip

 #===============
 # Expose Ports
@@ -1,4 +1,4 @@
-FROM appium/appium:1.8.1-p2
+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
@@ -0,0 +1,2 @@
+#!/system/bin/sh
+setprop persist.sys.usb.config adb
@@ -6,24 +6,38 @@ version: "2.2"
 services:
  # Selenium hub
  selenium_hub:
-    image: selenium/hub:3.12.0-americium
+    image: selenium/hub:3.14.0-curium
    ports:
      - 4444:4444

  # Please stop this container by using docker stop instead of docker-compose stop
-  genymotion:
+  saas:
    image: butomo1989/docker-android-genymotion
    depends_on:
      - selenium_hub
-    ports:
-      - 6080:6080
-      - 4723:4723
+    privileged: true
    volumes:
      - $PWD/sample_apk:/root/tmp/sample_apk
      - $PWD/sample_devices:/root/tmp
    environment:
-      - GENY_TEMPLATE=/root/tmp/devices.json
-      - USER=xxx
-      - PASS=xxx
-      - LICENSE=xxx
+      - TYPE=SaaS
+      - TEMPLATE=/root/tmp/devices.json
+      - USER=$USER
+      - PASS=$PASS
+      - LICENSE=$LICENSE
+      - CONNECT_TO_GRID=true
+
+  # Please stop this container by using docker stop instead of docker-compose stop
+  aws:
+    image: butomo1989/docker-android-genymotion
+    depends_on:
+      - selenium_hub
+    privileged: true
+    volumes:
+      - ~/.aws:/root/.aws
+      - $PWD/sample_apk:/root/tmp/sample_apk
+      - $PWD/sample_devices:/root/tmp
+    environment:
+      - TYPE=aws
+      - TEMPLATE=/root/tmp/aws.json
      - CONNECT_TO_GRID=true
@@ -0,0 +1,60 @@
+[
+	{
+		"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"
+					}
+				]
+			}
+		]
+	}
+]
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+(export USER=$USER && export PASS=$PASS && export LICENSE=$LICENSE && docker-compose -f geny.yml up -d)
@@ -1,18 +1,44 @@
 #!/bin/bash
 # This script is needed because of https://www.ctl.io/developers/blog/post/gracefully-stopping-docker-containers/

-if [ -z "$GENY_TEMPLATE" ]; then
-  	GENY_TEMPLATE="/root/tmp/devices.json"
+types=(saas aws)
+
+if [ -z "$TYPE" ]; then
+    echo "Please specify one of following types: ${types[@]}"
+    exit 1
+fi
+TYPE=$(echo "$TYPE" | tr '[:upper:]' '[:lower:]')
+
+if [ -z "$TEMPLATE" ]; then
+    case $TYPE in
+    "${types[0]}" )
+        TEMPLATE="/root/tmp/devices.json"
+        ;;
+    "${types[1]}" )
+        TEMPLATE="/root/tmp/aws.json"
+        ;;
+    *)
+        "Type $TYPE is not supported! Valid types: ${types[@]}"
+        exit 1
+        ;;
+    esac
 fi

-if [ ! -f "$GENY_TEMPLATE" ]; then
+if [ ! -f "$TEMPLATE" ]; then
    echo "File not found! Nothing to do!"
    exit 1
 fi

+echo "[geny_start] Available types: ${types[@]}"
+echo "[geny_start] Selected type of deployment: $TYPE, Template file: $TEMPLATE"
+export TYPE=$TYPE
+export TEMPLATE=$TEMPLATE
+export TYPES=${types[@]}
+
 getAbort() {
-    if [ "$GENYMOTION" = true ]; then
-        contents=$(cat $GENY_TEMPLATE)
+    case $TYPE in
+    "${types[0]}" )
+        contents=$(cat $TEMPLATE)
        echo "ABORT SIGNAL detected! Stopping all created emulators..."
        for row in $(echo "${contents}" | jq -r '.[] | @base64'); do
            get_value() {
@@ -22,7 +48,13 @@ getAbort() {
            gmtool --cloud admin stopdisposable $(get_value '.device')
        done
        echo "Done"
-    fi
+        ;;
+    "${types[1]}" )
+        contents=$(cat $TEMPLATE)
+        echo "ABORT SIGNAL detected! Detroy all EC2 instance(s)..."
+        ./terraform destroy -auto-approve -lock=false
+        ;;
+    esac
 }
 trap 'getAbort; exit' EXIT

@@ -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,18 +29,20 @@ 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
 # in order to chose the proper version of chromedriver (see http://chromedriver.chromium.org/downloads)
 declare -A chromedriver_versions=(
-        [5.0.1]="2.12"
+        [5.0.1]="2.21"
        [5.1.1]="2.13"
        [6.0]="2.18"
        [7.0]="2.23"
        [7.1.1]="2.28"
        [8.0]="2.31"
        [8.1]="2.33"
+        [9.0]="2.40"
 )

 function get_android_versions() {
@@ -144,7 +146,8 @@ function build() {
            IMG_TYPE=google_apis
            BROWSER=browser
        else
-            IMG_TYPE=google_apis_playstore
+            #adb root cannot be run in IMG_TYPE=google_apis_playstore 
+            IMG_TYPE=google_apis
            BROWSER=chrome
        fi
        echo "[BUILD] IMAGE TYPE: $IMG_TYPE"
@@ -160,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
 }
@@ -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
@@ -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
 }

@@ -1,6 +1,6 @@
 #!/bin/bash

-IMAGE_NAME="butomo1989/docker-android"
+IMAGE_NAME="budtmo/docker-android"

 if [ -z "$1" ]; then
    read -p "Type : " TYPE
@@ -4,6 +4,7 @@ import json
 import logging
 import os
 import subprocess
+import uuid

 from src import CHROME_DRIVER, CONFIG_FILE, ROOT
 from src import log
@@ -50,13 +51,7 @@ def convert_str_to_bool(str: str) -> bool:


 def is_initialized() -> bool:
-    return os.path.exists(INIT_FILE)
-
-
-def finish_initialization():
-    file = open(INIT_FILE, 'w+')
-    file.close()
-
+    return os.path.exists(os.path.join(ROOT, '.android', 'devices.xml'))

 ANDROID_HOME = get_or_raise('ANDROID_HOME')
 ANDROID_VERSION = get_or_raise('ANDROID_VERSION')
@@ -64,7 +59,6 @@ API_LEVEL = get_or_raise('API_LEVEL')
 PROCESSOR = get_or_raise('PROCESSOR')
 SYS_IMG = get_or_raise('SYS_IMG')
 IMG_TYPE = get_or_raise('IMG_TYPE')
-INIT_FILE = os.getenv('INIT_FILE', "/root/init")

 logger.info('Android version: {version} \n'
            'API level: {level} \n'
@@ -130,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)
@@ -192,6 +187,8 @@ def run():
    """Run app."""
    device = os.getenv('DEVICE', 'Nexus 5')
    logger.info('Device: {device}'.format(device=device))
+    custom_args=os.getenv('EMULATOR_ARGS', '')
+    logger.info('Custom Args: {custom_args}'.format(custom_args=custom_args))

    avd_name = '{device}_{version}'.format(device=device.replace(' ', '_').lower(), version=ANDROID_VERSION)
    logger.info('AVD name: {avd}'.format(avd=avd_name))
@@ -200,7 +197,6 @@ def run():
    if is_first_run:
        logger.info('Preparing emulator...')
        prepare_avd(device, avd_name)
-        finish_initialization()

    logger.info('Run emulator...')
    dp_size = os.getenv('DATAPARTITION', '550m')
@@ -208,9 +204,9 @@ def run():
        cfg.write('\ndisk.dataPartition.size={dp}'.format(dp=dp_size))

    if is_first_run:
-        cmd = 'emulator/emulator @{name} -gpu off -verbose -wipe-data'.format(name=avd_name)
+        cmd = 'emulator/emulator @{name} -gpu off -verbose -wipe-data {custom_args}'.format(name=avd_name, custom_args=custom_args)
    else:
-        cmd = 'emulator/emulator @{name} -gpu off -verbose'.format(name=avd_name)
+        cmd = 'emulator/emulator @{name} -gpu off -verbose {custom_args}'.format(name=avd_name, custom_args=custom_args)
    appium = convert_str_to_bool(str(os.getenv('APPIUM', False)))
    if appium:
        subprocess.Popen(cmd.split())
@@ -1,13 +1,14 @@
 #!/bin/bash

-if [ -z "$GENY_TEMPLATE" ]; then
-  	GENY_TEMPLATE="/root/tmp/devices.json"
-fi
+types=($TYPES)
+echo "Available types: ${types[@]}"
+echo "Selected type of deployment: $TYPE, Template file: $TEMPLATE"

 function prepare_geny_cloud() {
-	contents=$(cat $GENY_TEMPLATE)
+	contents=$(cat $TEMPLATE)

 	# Register
+	echo "Register user"
 	gmtool config username="${USER}" password="${PASS}"
 	gmtool license register "${LICENSE}"

@@ -21,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\"..."
@@ -32,6 +34,243 @@ function prepare_geny_cloud() {
 	done
 }

+function prepare_geny_aws() {
+	contents=$(cat $TEMPLATE)
+
+	# Creating aws tf file(s)
+	echo "Creating tf file(s)"
+	index=1
+	port=5555
+	for row in $(echo "${contents}" | jq -r '.[] | @base64'); do
+		get_value() {
+			echo ${row} | base64 --decode | jq -r ${1}
+		}
+
+		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')
+
+
+					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" {
+	type	= "string"
+	default = "$region"
+}
+
+variable "android_version_$index" {
+	type    = "string"
+	default = "$android_version"
+}
+
+variable "instance_type_$index" {
+	type    = "string"
+	default = "$instance"
+}
+
+provider "aws" {
+	alias = "provider_$index"
+	region  = "\${var.aws_region_$index}"
+}
+
+resource "aws_security_group" "geny_sg_$index" {
+	provider = "aws.provider_$index"
+	$security_group
+}
+
+data "aws_ami" "geny_aws_$index" {
+    provider    = "aws.provider_$index"
+    most_recent = true
+
+    filter {
+        name   = "name"
+        values = ["genymotion-ami-\${var.android_version_$index}-*"]
+    }
+
+	owners = ["679593333241"] #Genymotion
+}
+
+resource "aws_key_pair" "geny_key_$index" {
+	provider 	  = "aws.provider_$index"
+	public_key	  = "\${file("~/.ssh/id_rsa.pub")}"
+}
+
+resource "aws_instance" "geny_aws_$index" {
+	provider      = "aws.provider_$index"
+	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}"]
+	key_name      = "\${aws_key_pair.geny_key_$index.key_name}"
+	tags {
+		Name = "DockerAndroid-\${data.aws_ami.geny_aws_$index.id}"
+	}
+	count = 1
+
+	provisioner "remote-exec" {
+		connection {
+			type = "ssh"
+			user = "shell"
+			private_key = "\${file("~/.ssh/id_rsa")}"
+		}
+
+		script = "/root/enable_adb.sh"
+    }
+}
+
+output "public_dns_$index" {
+    value = "\${aws_instance.geny_aws_$index.public_dns}"
+}
+_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
+
+	# Deploy EC2 instance(s)
+	echo "Deploy EC2 instance(s) on AWS with Genymotion image based on given json file..."
+	./terraform init
+	./terraform plan 
+	./terraform apply -auto-approve
+
+	# Workaround to connect adb remotely because there is a issue by using local-exec
+	time_sleep=5
+	interval_sleep=1
+	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 -o ServerAliveInterval=60 -o StrictHostKeyChecking=no -q -NL ${port}:localhost:5555 shell@${dns}) &
+		((port--))
+		time_sleep=$((time_sleep+interval_sleep))
+	done
+	echo "It will wait for ${time_sleep} until all device(s) to be connected"
+	sleep ${time_sleep}
+	adb devices
+	echo "Process is completed"
+}
+
 function run_appium() {
 	echo "Preparing appium-server..."
 	CMD="appium --log $APPIUM_LOG"
@@ -49,13 +288,49 @@ 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
 elif [ "$GENYMOTION" = true ]; then
 	echo "Using Genymotion"
-	prepare_geny_cloud
-	run_appium
+	echo "${types[@]}"
+	case $TYPE in
+	"${types[0]}" )
+		echo "Using Genymotion-Cloud (SaaS)"
+		prepare_geny_cloud
+		run_appium
+		;;
+	"${types[1]}" )
+		echo "Using Genymotion-AWS"
+		prepare_geny_aws
+		run_appium
+		;;
+	esac
 else
 	echo "Using Emulator"
 	python3 -m src.app
@@ -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
@@ -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')
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+function wait_emulator_to_be_ready () {
+  boot_completed=false
+  while [ "$boot_completed" == false ]; do
+    status=$(adb wait-for-device shell getprop sys.boot_completed | tr -d '\r')
+    echo "Boot Status: $status"
+
+    if [ "$status" == "1" ]; then
+      boot_completed=true
+    else
+      sleep 1
+    fi      
+  done
+}
+
+function change_language_if_needed() {
+  if [ ! -z "${LANGUAGE// }" ] && [ ! -z "${COUNTRY// }" ]; then
+    wait_emulator_to_be_ready
+    echo "Languge will be changed to ${LANGUAGE}-${COUNTRY}"
+    adb root && adb shell "setprop persist.sys.language $LANGUAGE; setprop persist.sys.country $COUNTRY; stop; start" && adb unroot
+    echo "Language is changed!"
+  fi
+}
+
+function install_google_play () {
+  wait_emulator_to_be_ready
+  echo "Google Play Service will be installed"
+  adb install -r "/root/google_play_services.apk"
+  echo "Google Play Store will be installed"
+  adb install -r "/root/google_play_store.apk"
+}
+
+function disable_animation () {
+  # To improve performance
+  adb shell "settings put global window_animation_scale 0.0"
+  adb shell "settings put global transition_animation_scale 0.0"
+  adb shell "settings put global animator_duration_scale 0.0"
+}
+
+change_language_if_needed
+sleep 1
+install_google_play
+disable_animation
@@ -55,3 +55,10 @@ autorestart=false
 stdout_logfile=%(ENV_LOG_PATH)s/video-recording.stdout.log
 stderr_logfile=%(ENV_LOG_PATH)s/video-recording.stderr.log
 priority=4
+
+[program:adb-utils]
+command=./src/utils.sh
+autorestart=false
+stdout_logfile=%(ENV_LOG_PATH)s/adb-utils.stdout.log
+stderr_logfile=%(ENV_LOG_PATH)s/adb-utils.stderr.log
+priority=5
@@ -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
Author	SHA1	Message	Date
budtmo	14b6091277	Deleted old video	2019-01-30 15:01:28 +01:00
budtmo	5acbce6654	Renamed	2019-01-30 14:58:31 +01:00
butomo1989	1c844033f6	Merge branch 'master' of github.com:butomo1989/docker-android	2019-01-16 10:49:17 +01:00
butomo1989	83ba9bb79e	Using Appium 1.10.1	2019-01-16 10:49:05 +01:00
Budi UtomoandGitHub	712d3485ad	Merge pull request #139 from nichotined/master Added documentation how to connect emulator to the host	2019-01-16 09:36:35 +01:00
Nicholas FrederickandGitHub	04512a0d16	Update README.md Added Control Android connected to host (Emulator or Real Device)	2019-01-15 22:30:58 +07:00
butomo1989	cf0ebd7eb9	Fixed #138	2019-01-15 10:19:42 +01:00
butomo1989	32cb68f6c9	Updated base image	2019-01-08 10:48:11 +01:00
Budi UtomoandGitHub	98b0b3a140	Merge pull request #134 from tadashi0713/add_unittest_relaxed_security Add unittest to run appium with relaxed security	2019-01-07 09:20:58 +01:00
Tadashi NemotoandGitHub	2c9c421c35	Merge branch 'master' into add_unittest_relaxed_security	2019-01-05 15:59:12 +09:00
tadashi0713	afea49a2c8	Add unittest to run appium with relaxed security	2019-01-05 15:56:24 +09:00
butomo1989	442a10afd2	Fixed wrong file	2019-01-02 13:32:09 +01:00
butomo1989	478e0d0e51	Added blog about integration between Genymotion and DockerAndroid	2019-01-02 13:29:40 +01:00
butomo1989	17d09eb835	Renamed	2018-11-29 09:16:30 +01:00
butomo1989	09c3fbe765	Edited wrong port	2018-11-29 09:09:07 +01:00
butomo1989	b285d8a1da	Renamed type for consistency in article	2018-11-29 09:07:26 +01:00
Budi UtomoandGitHub	46d3a4f8c1	Removed because the content of it is old	2018-11-22 16:39:23 +01:00
butomo1989	033be6d7c4	Keep ssh sessions alive	2018-11-22 12:17:17 +01:00
butomo1989	84ed95aac1	Merge branch 'master' of github.com:butomo1989/docker-android	2018-11-19 13:01:28 +01:00
butomo1989	c298cc7ae1	Enabled of using existing security group	2018-11-19 13:01:18 +01:00
Budi UtomoandGitHub	0ab0eaffcf	Typo	2018-11-19 10:53:53 +01:00
butomo1989	0e00cffe4d	Corrected the example of json file for Genymotion on AWS	2018-11-15 15:02:29 +01:00
butomo1989	3dc73b4573	Enabled custom security group	2018-11-14 13:56:41 +01:00
Budi UtomoandGitHub	711cbfef72	Updated lines	2018-11-09 15:58:36 +01:00
butomo1989	67a0935fc5	Using custom_ami doesnt need android_version	2018-11-08 12:54:20 +01:00
butomo1989	55012f9ac0	Enable custom AMI which given from the user	2018-11-07 16:29:14 +01:00
butomo1989	2e379769e9	Added engress for AWS deployment for Genymotion	2018-11-05 14:49:59 +01:00
butomo1989	2ffb3a0c3d	Added Android version for Google Analytics	2018-11-05 14:28:36 +01:00
butomo1989	e49d2a58cb	Enabled GA	2018-10-26 15:54:04 +02:00
butomo1989	099afef2a1	Added header	2018-10-26 15:18:27 +02:00
butomo1989	67a4468b05	Modified file type	2018-10-26 15:05:14 +02:00
butomo1989	21306b5b08	Linked license in README	2018-10-26 15:03:44 +02:00
butomo1989	500fff9da4	Added google analytics and automation script for Genymotion	2018-10-26 15:00:46 +02:00
butomo1989	68db6315d4	Enabled Android 9.0	2018-10-23 16:22:03 +02:00
butomo1989	2ad579c77b	Added Android 9.0	2018-10-23 16:17:12 +02:00
Budi UtomoandGitHub	bc5cb96ca9	Merge pull request #124 from stazdx/aks-terraform Custom charts added for deployment on Azure	2018-10-15 12:50:40 +02:00
Staz Dx	85b2312b7f	Kompose/volumes.yaml deleted	2018-10-12 18:17:12 -05:00
Staz Dx	b518b38c35	Custom chart for running in AKS (recommended)	2018-10-12 18:15:21 -05:00
Staz Dx	1ebdbc7873	Custom chart for running in AKS (recommended)	2018-10-12 18:14:26 -05:00
Budi UtomoandGitHub	b3c8cb3cce	Merge pull request #123 from stazdx/aks-terraform Running it in (Azure Kubernetes Service) AKS by using Terraform, Azure CLI, Kompose & Kubectl	2018-10-11 08:18:00 +02:00
Staz Dx	05aa522965	Running in AKS using Terraform, Azure CLI, Kompose & Kubectl	2018-10-10 18:27:18 -05:00
Budi UtomoandGitHub	2a48fc6f71	Merge pull request #122 from kjlubick/patch-1 Added steps for deploying on GCE	2018-10-06 15:19:37 +02:00
Kevin LubickandGitHub	fd4a5a0763	Add a bit more verbosity	2018-10-05 14:47:17 -04:00
Kevin LubickandGitHub	7c085db7a3	Add Cloud instructions for GCE	2018-10-05 11:12:55 -04:00
butomo1989	e5817ebe7d	Formatted	2018-09-27 15:13:46 +02:00
butomo1989	2ed92c97e1	Added sample of docker terraform	2018-09-27 15:12:03 +02:00
butomo1989	156fc288c7	Using the latest base image	2018-09-27 09:48:27 +02:00
butomo1989	c790d05e19	Using the needed rules in security group	2018-09-26 17:38:28 +02:00
butomo1989	78b9b79212	Renamed the tag	2018-09-21 13:57:31 +02:00
Budi UtomoandGitHub	57ae8a1f16	Merge pull request #119 from lilinor/contribution update genymotion readme file	2018-09-17 18:16:28 +02:00
butomo1989	fc90713016	Fixed broken link	2018-09-14 16:19:46 +02:00
butomo1989	948b5cc07b	Merge branch 'master' of github.com:butomo1989/docker-android	2018-09-14 15:37:10 +02:00
butomo1989	dfc86227e0	Added instruction to use camera	2018-09-14 15:37:00 +02:00
Budi UtomoandGitHub	dfa70768ab	Merge pull request #118 from tadashi0713/add-aws-intro Added AWS instruction	2018-09-14 10:27:26 +02:00
Tadashi NemotoandGitHub	a34a7e8339	Add AWS Instruction Instruction to use EC2 Bare Metal Instance	2018-09-14 12:37:03 +09:00
lilinor	e9726a86af	update genymotion readme file	2018-09-13 17:46:14 +02:00
butomo1989	4e5370b85b	Cleaned up	2018-09-04 12:01:47 +02:00
butomo1989	da177442ce	Cleaned up	2018-09-04 10:34:49 +02:00
butomo1989	e2800863e8	Deleted old badge	2018-09-03 12:05:23 +02:00
butomo1989	c4bd3dcf55	Updated version of Selenium Grid in examples	2018-09-03 10:28:58 +02:00
butomo1989	ac594d96e9	Updated base image	2018-09-03 10:04:48 +02:00
butomo1989	a49cc2950e	Cleaned up	2018-08-30 13:46:14 +02:00
butomo1989	6b657dd13e	Replaced the hard code	2018-08-30 13:36:53 +02:00
butomo1989	aa7a798f62	Connect to Genymotion emulator automatically	2018-08-30 13:35:03 +02:00
butomo1989	ccec2c5969	Using specific version of appium as base image because a release issue with it	2018-08-30 12:05:49 +02:00
butomo1989	e45bc0010f	Enabled adb remotely	2018-08-29 13:02:44 +02:00
butomo1989	efd1f07e58	Fixed escape char	2018-08-27 14:32:33 +02:00
butomo1989	73418a8b4f	Fixed escape char	2018-08-27 14:30:51 +02:00
Budi UtomoandGitHub	ad444fd738	Merge pull request #116 from bonigarcia/master Fix chromedriver version for Android 5.0.1	2018-08-27 09:48:28 +02:00
Boni Garcia	12391277e6	Fix chromedriver version for Android 5.0.1	2018-08-27 09:31:06 +02:00
Budi UtomoandGitHub	c50f185c65	Merge pull request #115 from stazdx/master Added documentation about Azure	2018-08-27 09:11:18 +02:00
stazdxandGitHub	62090f73b4	Merge pull request #1 from stazdx/azure-docs Enable nested virtualization on Azure	2018-08-24 17:49:41 -05:00
stazdxandGitHub	7bce737447	Enable nested virtualization on Azure	2018-08-24 17:49:10 -05:00
butomo1989	f2c6ab79bb	Enabled key pair	2018-08-24 16:14:04 +02:00
butomo1989	afcbd4a7e7	Merge branch 'master' into release-1.4	2018-08-21 16:45:54 +02:00
Budi UtomoandGitHub	9a714e5fb3	Merge pull request #111 from devilankur18/custom_args Able to pass custom arguments to Emulator	2018-08-21 16:23:22 +02:00
Ankur Agarwal	a6394bcf74	added support for custom arguments while running/creating emulator	2018-08-21 17:50:50 +05:30
butomo1989	43d0bb1292	Merge branch 'release-1.4' of github.com:butomo1989/docker-android into release-1.4	2018-08-21 09:49:41 +02:00
butomo1989	e56352bf74	Added provider id	2018-08-21 09:49:10 +02:00
Budi UtomoandGitHub	7746b0ce1a	Merge pull request #112 from red-avtovo/appium_latest Appium latest image	2018-08-21 08:55:25 +02:00
Aleksandr Bochev	806443e956	switched to base image latest appium	2018-08-20 17:38:53 +02:00
butomo1989	a5d0e6eba2	Always use the latest AMI image	2018-08-20 11:46:09 +02:00
butomo1989	ac9371a2ed	Merge branch 'master' into release-1.4	2018-08-20 09:51:35 +02:00
Budi UtomoandGitHub	f3abb0a828	Merge pull request #110 from devilankur18/emulator_backup_restore AVD initialisation based on devices xml file	2018-08-16 18:04:20 +02:00
Ankur Agarwal	c653efc7b1	fixes related to initialization	2018-08-16 12:36:51 +00:00
butomo1989	bcd7d9a29b	Back to user mode	2018-08-14 09:14:25 +02:00
butomo1989	dd7ef41590	Added integration with Genymotion in AWS	2018-08-11 19:38:47 +02:00
butomo1989	d7c9730712	Fixed issue #90	2018-08-03 15:58:07 +02:00
butomo1989	735bc64a2d	Cleaned up	2018-08-03 15:56:36 +02:00
butomo1989	307d6502af	Fixed string	2018-08-02 12:52:31 +02:00
butomo1989	91a4e270c6	Refactored code	2018-08-02 11:42:19 +02:00
Budi UtomoandGitHub	d13e60a122	Merge pull request #104 from devilankur18/master Added device_id support via ENV variable or auto uuid values	2018-07-31 09:04:58 +02:00
Ankur AgarwalandGitHub	c4be3a1ac0	Merge branch 'master' into master	2018-07-31 01:24:15 +05:30
Ankur AgarwalandGitHub	7c7eed4a3d	Fixing trailing whitespaces	2018-07-31 01:17:01 +05:30
Budi UtomoandGitHub	d0271e0be0	Merge pull request #103 from mehrdad-abdoli/master Update Google Play Store app	2018-07-30 17:00:42 +02:00
App-Test	9d71ecded7	Update Google Play Services and some other useful stuff by adb	2018-07-30 16:30:19 +04:30
App-Test	81af88e7a4	Update Google Play Services and some other useful stuff by adb	2018-07-30 16:28:41 +04:30
App-Test	a8f7fd2d02	Update Google Play Services and some other useful stuff by adb	2018-07-30 16:26:57 +04:30
App-Test	de71e5156c	Update Google Play Services and some other useful stuff by adb	2018-07-30 16:19:05 +04:30
Ankur AgarwalandGitHub	bcf27f0489	Added logging	2018-07-28 23:20:06 +05:30
Ankur AgarwalandGitHub	972445a8bc	Assign device_id via environment variable	2018-07-28 23:07:03 +05:30
App-Test	460e0b8daf	Update Google Play Services and some other useful stuff by adb	2018-07-28 16:53:26 +04:30