Using the latest base image

update genymotion readme file

README.md

@@ -207,7 +207,7 @@ Special Thanks
 - [Gian Christanto] for creating a great logo!
 
 [appium]: <https://appium.io>
-[espresso]: <https://google.github.io/android-testing-support-library/docs/espresso/>
+[espresso]: <https://developer.android.com/training/testing/espresso/>
 [robotium]: <https://github.com/RobotiumTech/robotium>
 [emulator samsung]: <images/emulator_samsung_galaxy_s6.png>
 [emulator nexus]: <images/emulator_nexus_5.png>

README_CLOUD.md

@@ -3,3 +3,8 @@ 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/

README_CUSTOM_CONFIG.md

@@ -15,6 +15,13 @@ You can change the language setting of Android Emulator on the fly by passing fo
 - LANGUAGE="\<language>"
 - COUNTRY="\<country>"
 
+Camera
+------
+
+Passing following environment variable to be able to connect laptop / pc camera to Android emulator:
+
+- EMULATOR_ARGS="-camera-back webcam0"
+
 Custom Emulator Arguments
 -------------------------
 

README_GENYMOTION.md

@@ -1,9 +1,9 @@
-Genymotion
-----------
+Genymotion Cloud
+----------------
 
-You can easily scale your Appium tests on Genymotion Android virtual devices in the cloud. 
+You can easily scale your Appium tests on Genymotion Android virtual devices in the cloud. They are available on SaaS or as virtual images on AWS, GCP or Alibaba Cloud.
 
-1. Using Genymotion 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
@@ -18,7 +18,7 @@ You can easily scale your Appium tests on Genymotion Android virtual devices in
    <a href="https://youtu.be/jXhUEyaVeMY"><img src="./images/Genymotion_cloud.png" alt="Docker-Android supports Genymotion Cloud" width="600"></a>
 </p>
 
-2. Using Genymotion on AWS
+2. On PaaS (AWS) <br />
 	Use [aws.json](genymotion/example/sample_devices/aws.json) to define configuration of EC2 instance and run following command:
 
 	```bash

docker/Emulator_x86

@@ -1,4 +1,4 @@
-FROM appium/appium:1.9.0-p0
+FROM appium/appium:1.9.1-p0
 
 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
 

docker/Genymotion

@@ -1,4 +1,4 @@
-FROM appium/appium:1.9.0-p0
+FROM appium/appium:1.9.1-p0
 
 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
 

docker/Real_device

@@ -1,4 +1,4 @@
-FROM appium/appium:1.9.0-p0
+FROM appium/appium:1.9.1-p0
 
 LABEL maintainer "Budi Utomo <budi.ut.1989@gmail.com>"
 

src/appium.sh

@@ -22,6 +22,7 @@ function prepare_geny_cloud() {
 	    template=$(get_value '.template')
 	    device=$(get_value '.device')
 	    port=$(get_value '.port')
+	    
 
 	    if [[ $port != null ]]; then
 	    	echo "Starting \"$device\" with template name \"$template\" on port \"$port\"..."
@@ -49,7 +50,6 @@ function prepare_geny_aws() {
 	    android_version=$(get_value '.android_version')
 	    instance=$(get_value '.instance')
 
-
 	    echo $region
 	    echo $android_version
 	    echo $instance
@@ -76,19 +76,40 @@ provider "aws" {
 }
 
 resource "aws_security_group" "geny_sg_$index" {
-	provider 			= "aws.provider_$index"
+	provider = "aws.provider_$index"
 	ingress {
-		from_port		= 0
-		to_port			= 65535
-		protocol		= "tcp"
-		cidr_blocks		= ["0.0.0.0/0"]
+		from_port       = 22
+		to_port         = 22
+		protocol        = "tcp"
+		cidr_blocks     = ["0.0.0.0/0"]
+		description     = "SSH access"
+	}
+	ingress {
+		from_port       = 80
+		to_port         = 80
+		protocol        = "tcp"
+		cidr_blocks     = ["0.0.0.0/0"]
+		description     = "HTTP access"
+	}
+	ingress {
+		from_port       = 443
+		to_port         = 443
+		protocol        = "tcp"
+		cidr_blocks     = ["0.0.0.0/0"]
+		description     = "HTTPS access"
+	}
+	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"]
-    }
 }
 
 data "aws_ami" "geny_aws_$index" {
@@ -115,7 +136,7 @@ resource "aws_instance" "geny_aws_$index" {
 	vpc_security_group_ids = ["\${aws_security_group.geny_sg_$index.name}"]
 	key_name      = "\${aws_key_pair.geny_key_$index.key_name}"
 	tags {
-		Name = "EK-\${data.aws_ami.geny_aws_$index.id}"
+		Name = "DockerAndroid-\${data.aws_ami.geny_aws_$index.id}"
 	}
 	count = 1