Added docker-android users statistics

Update README to call out that google play store not installed

.travis.yml

@@ -20,6 +20,7 @@ env:
   - ANDROID_VERSION=8.1
   - ANDROID_VERSION=9.0
   - ANDROID_VERSION=10.0
+  - ANDROID_VERSION=11.0
   - REAL_DEVICE=True
   - GENYMOTION=True
 

README.md

@@ -52,6 +52,7 @@ List of Docker images
 |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")|
 |Linux|10.0|29|chrome|74.0|74.0.3729.6|budtmo/docker-android-x86-10.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-10.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-10.0 "Get your own image badge on microbadger.com")|
+|Linux|11.0|30|chrome|83.0|83.0.4103.39|budtmo/docker-android-x86-11.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-11.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-11.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")|
 |All|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")|
 
@@ -101,7 +102,7 @@ Quick Start
 
    - For different OS, localhost should work.
 
-3. Open ***http://docker-host-ip-address:6080*** from web browser.
+3. Open ***http://docker-host-ip-address:6080*** from web browser. Note: Adding ```?view_only=true``` will give user only view only permission.
 
 Custom configurations
 ---------------------
@@ -208,8 +209,7 @@ SMS Simulation
 
 Google Play Services and Google Play Store
 ------------------------------------------
-
-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.
+Not installed at this time.
 
 Jenkins
 -------
@@ -251,6 +251,12 @@ Security
 --------
 All docker images are protected by [Polyverse](https://polyverse.io/) by scrambling the Linux packages. For more information please read [this](https://polyverse.io/how-it-works/)
 
+Users
+-----
+Docker-Android are being used by 100+ countries around the world.
+
+[![ga-datastudio-docker-android](./images/users.png)](https://datastudio.google.com/s/ht7HVKHKAQE)
+
 Special Thanks
 --------------
 - [Gian Christanto] for creating a great logo!

README_APPIUM_AND_SELENIUM.md

@@ -24,6 +24,7 @@ It is also possible to connect appium server that run inside docker-android with
 - APPIUM_PORT=\<port\_number>
 - SELENIUM_HOST="\<host\_ip\_address>"
 - SELENIUM_PORT=\<port\_number>
+- SELENIUM_TIMEOUT=\<timeout\_in\_seconds>
 
 To run tests for mobile browser, following parameter can be passed:
 

README_CUSTOM_CONFIG.md

@@ -1,3 +1,8 @@
+VNC pass
+--------
+
+Passing ```VNC_PASSWORD="your_pass_here"``` will secure your vnc connection. 
+
 Proxy
 -----
 
@@ -72,3 +77,8 @@ docker run --privileged -d -p 6080:6080 -p 4723:4723 -p 5554:5554 -p 5555:5555 -
 ```
 
 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`
+
+Nginx
+-----
+
+Sample nginx configuration can be found [here](nginx)

docker/Emulator_x86

@@ -1,4 +1,4 @@
-FROM appium/appium:1.17.1-p0
+FROM appium/appium:1.17.1-p1
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 
@@ -171,6 +171,13 @@ ADD src/.fehbg /root/.fehbg
 ADD src/rc.xml /etc/xdg/openbox/rc.xml
 RUN echo /root/.fehbg >> /etc/xdg/openbox/autostart
 
+#======================
+# Workarounds
+#======================
+# Fix emulator from crashing when running as root user.
+# See https://github.com/budtmo/docker-android/issues/223
+ENV QTWEBENGINE_DISABLE_SANDBOX=1
+
 #===============
 # Expose Ports
 #---------------

docker/Genymotion

@@ -1,4 +1,4 @@
-FROM appium/appium:1.17.1-p0
+FROM appium/appium:1.17.1-p1
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 

docker/Real_device

@@ -1,4 +1,4 @@
-FROM appium/appium:1.17.1-p0
+FROM appium/appium:1.17.1-p1
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 

nginx/README.md

@@ -0,0 +1,16 @@
+Nginx
+-----
+
+You can have one page which contains the list of running containers.
+
+##### Quick Start
+
+1. Run 2 docker-android containers which have port 6081 and 6082 
+
+2. Run docker-nginx 
+
+    ```
+    docker run -d --name nginx --network host -v $PWD/conf.d:/etc/nginx/conf.d nginx:1.18.0 
+    ```
+
+3. Open [http://127.0.0.1](http://127.0.0.1) from Web-Browser to see the list of running containers OR open ```http://127.0.0.1/container-1/?nginx=&path=/container-1/websockify&view_only=true&password=secr3t``` to see specific container.

nginx/conf.d/data/data.json

@@ -0,0 +1,11 @@
+containers = '[\
+    {\
+        "No": "1", \
+        "Name": "Emulator 01", \
+        "VNC": "http://127.0.0.1/container-1/?nginx=&path=/container-1/websockify&view_only=true"\
+    }, \
+    {\
+        "No": "2", \
+        "Name": "Emulator 02", \
+        "VNC": "http://127.0.0.1/container-2/?nginx=&path=/container-2/websockify&view_only=true"\
+}]';

nginx/conf.d/default.conf

@@ -0,0 +1,43 @@
+server {
+    listen 80;
+    server_name _;
+
+    location / {
+        root /etc/nginx/conf.d;
+        index index.html;
+    }
+
+    location /container-1/ {
+        proxy_pass http://127.0.0.1:6081/;
+    }
+
+    location /container-1/websockify {
+        proxy_pass http://127.0.0.1:6081/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        # VNC connection timeout
+        proxy_read_timeout 61s;
+
+        # Disable cache
+        proxy_buffering off;
+    }
+
+    location /container-2/ {
+        proxy_pass http://127.0.0.1:6082/;
+    }
+
+    location /container-2/websockify {
+        proxy_pass http://127.0.0.1:6082/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        # VNC connection timeout
+        proxy_read_timeout 61s;
+
+        # Disable cache
+        proxy_buffering off;
+    }
+}

nginx/conf.d/index.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>List of docker-android containers</title>
+    <link href="styles/main.css" type="text/css" rel="stylesheet"> 
+</head>
+<body>
+    <div id="showData"></div>
+    <script type="text/javascript" src="data/data.json"></script>
+    <script src="scripts/main.js" type="text/javascript"></script>
+</body>
+</html>

nginx/conf.d/scripts/main.js

@@ -0,0 +1,55 @@
+var devices = JSON.parse(containers);
+
+var headers = [];
+for (var pos = 0; pos < devices.length; pos++) {
+    for (var deviceKey in devices[pos]) {
+        // Check if key is already added to headers
+        if (headers.indexOf(deviceKey) === -1) {
+            headers.push(deviceKey);
+        }
+    }
+}
+
+// Create a table
+var table = document.createElement("table");
+
+// Insert table header
+var tr = table.insertRow(-1); 
+for (var pos = 0; pos < headers.length; pos++) {
+    var th = document.createElement("th");      // TABLE HEADER.
+    var header = headers[pos];
+    th.innerHTML = header;
+    tr.appendChild(th);
+}
+
+// Insert table content
+for (var pos = 0; pos < devices.length; pos++) {
+    tr = table.insertRow(-1);
+    for (var index = 0; index < headers.length; index++) {
+        var td = document.createElement("td");
+        var content = devices[pos][headers[index]];
+
+        if (index === 1) {
+            var link = document.createElement("a");
+            link.href = devices[pos][headers[index+1]];
+            link.innerHTML = content;
+            td.appendChild(link);
+        } else if (index === 2) {
+            var object = document.createElement("object");
+            object.type = "text/html";
+            object.data = content;
+            object.width = "950px";
+            object.height = "950px";
+            td.appendChild(object);
+        } else {
+            td.innerHTML = content;    
+        }
+
+        tr.appendChild(td);
+    }
+}
+
+// Put the table inside div
+var divContainer = document.getElementById("showData");
+divContainer.innerHTML = "";
+divContainer.appendChild(table);

nginx/conf.d/styles/main.css

@@ -0,0 +1,13 @@
+th, td {
+    font:14px Verdana;
+}
+table, th, td 
+{
+    border: solid 1px #DDD;
+    border-collapse: collapse;
+    padding: 2px 3px;
+    text-align: center;
+}
+th {
+    font-weight:bold;
+}

release.sh

@@ -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|9.0|10.0|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|10.0|11.0|all): " ANDROID_VERSION
 else
     ANDROID_VERSION=$2
 fi
@@ -31,6 +31,7 @@ declare -A list_of_levels=(
         [8.1]=27
         [9.0]=28
         [10.0]=29
+        [11.0]=30
 )
 
 # The version of the Chrome browser installed on the Android emulator needs to be known beforehand
@@ -45,6 +46,7 @@ declare -A chromedriver_versions=(
         [8.1]="2.33"
         [9.0]="2.40"
         [10.0]="74.0.3729.6"
+        [11.0]="83.0.4103.39"
 )
 
 function get_android_versions() {
@@ -147,10 +149,16 @@ function build() {
             # It is because there is no ARM EABI v7a System Image for 6.0
             IMG_TYPE=google_apis
             BROWSER=browser
+        elif [ "$v" == "" ]; then
+            IMG_TYPE=google_apis
+            BROWSER=chrome            
         else
             #adb root cannot be run in IMG_TYPE=google_apis_playstore 
             IMG_TYPE=google_apis
             BROWSER=chrome
+            if [ "$v" == "9.0" ]; then
+                processor=x86_64
+            fi
         fi
         echo "[BUILD] IMAGE TYPE: $IMG_TYPE"
         level=${list_of_levels[$v]}
@@ -159,8 +167,8 @@ function build() {
         echo "[BUILD] System Image: $sys_img"
         chrome_driver="${chromedriver_versions[$v]}"
         echo "[BUILD] chromedriver version: $chrome_driver"
-        image_version="$IMAGE-$processor-$v:$RELEASE"
-        image_latest="$IMAGE-$processor-$v:latest"
+        image_version="$IMAGE-x86-$v:$RELEASE"
+        image_latest="$IMAGE-x86-$v:latest"
         echo "[BUILD] Image name: $image_version and $image_latest"
         echo "[BUILD] Dockerfile: $FILE_NAME"
         docker build -t $image_version --build-arg TOKEN=$TOKEN --build-arg ANDROID_VERSION=$v --build-arg API_LEVEL=$level \
@@ -174,8 +182,8 @@ function build() {
 function push() {
     # Push docker image(s)
     for v in "${versions[@]}"; do
-        image_version="$IMAGE-$processor-$v:$RELEASE"
-        image_latest="$IMAGE-$processor-$v:latest"
+        image_version="$IMAGE-x86-$v:$RELEASE"
+        image_latest="$IMAGE-x86-$v:latest"
         echo "[PUSH] Image name: $image_version and $image_latest"
         docker push $image_version
         docker push $image_latest

src/app.py

@@ -148,8 +148,10 @@ def appium_run(avd_name: str):
             appium_port = int(os.getenv('APPIUM_PORT', 4723))
             selenium_host = os.getenv('SELENIUM_HOST', '172.17.0.1')
             selenium_port = int(os.getenv('SELENIUM_PORT', 4444))
+            selenium_timeout = int(os.getenv('SELENIUM_TIMEOUT', 30))
             browser_name = default_web_browser if mobile_web_test else 'android'
-            create_node_config(avd_name, browser_name, appium_host, appium_port, selenium_host, selenium_port)
+            create_node_config(avd_name, browser_name, appium_host, appium_port, selenium_host, selenium_port,
+                               selenium_timeout)
             cmd += ' --nodeconfig {file}'.format(file=CONFIG_FILE)
         except ValueError as v_err:
             logger.error(v_err)
@@ -158,7 +160,7 @@ def appium_run(avd_name: str):
 
 
 def create_node_config(avd_name: str, browser_name: str, appium_host: str, appium_port: int, selenium_host: str,
-                       selenium_port: int):
+                       selenium_port: int, selenium_timeout: int):
     """
     Create custom node config file in json format to be able to connect with selenium server.
 
@@ -167,6 +169,7 @@ def create_node_config(avd_name: str, browser_name: str, appium_host: str, appiu
     :param appium_port: Port number where where appium server is running
     :param selenium_host: Host where selenium server is running
     :param selenium_port: Port number where selenium server is running
+    :param selenium_timeout: Selenium session timeout in seconds
     """
     config = {
         'capabilities': [
@@ -181,7 +184,7 @@ def create_node_config(avd_name: str, browser_name: str, appium_host: str, appiu
         ],
         'configuration': {
             'cleanUpCycle': 2000,
-            'timeout': 30,
+            'timeout': selenium_timeout,
             'proxy': 'org.openqa.grid.selenium.proxy.DefaultRemoteProxy',
             'url': 'http://{host}:{port}/wd/hub'.format(host=appium_host, port=appium_port),
             'host': appium_host,

src/tests/unit/test_appium.py

@@ -58,7 +58,7 @@ class TestAppium(TestCase):
     def test_config_creation(self):
         from src import CONFIG_FILE
         self.assertFalse(os.path.exists(CONFIG_FILE))
-        app.create_node_config('test', 'android', '127.0.0.1', 4723, '127.0.0.1', 4444)
+        app.create_node_config('test', 'android', '127.0.0.1', 4723, '127.0.0.1', 4444, 30)
         self.assertTrue(os.path.exists(CONFIG_FILE))
         os.remove(CONFIG_FILE)
 

src/vnc.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+vnc="/usr/bin/x11vnc -display ${DISPLAY} -forever -shared "
+
+pass_path="/root/vncpass"
+if [ ! -z "${VNC_PASSWORD}" ]; then
+	/usr/bin/x11vnc -storepasswd ${VNC_PASSWORD} ${pass_path}
+	param="-rfbauth ${pass_path}"
+else 
+	param="-nopw"
+fi
+
+${vnc}${param}

supervisord.conf

@@ -17,7 +17,7 @@ stderr_logfile=%(ENV_LOG_PATH)s/openbox.stderr.log
 priority=2
 
 [program:x11vnc]
-command=/usr/bin/x11vnc -display %(ENV_DISPLAY)s -nopw -forever -shared
+command=./src/vnc.sh
 stdout_logfile=%(ENV_LOG_PATH)s/x11vnc.stdout.log
 stderr_logfile=%(ENV_LOG_PATH)s/x11vnc.stderr.log
 priority=2