Merge branch 'master' of github.com:butomo1989/docker-android

Updated base image
Merge pull request #270 from jnvillar/patch-1
2026-07-31 04:07:25 +00:00 · 2021-01-08 08:34:25 +01:00 · 2021-01-08 08:34:06 +01:00 · 2021-01-07 10:42:00 +01:00 · 2020-12-17 10:49:08 -03:00 · 2020-09-02 11:33:07 +02:00
7 changed files with 36 additions and 5 deletions
@@ -251,6 +251,10 @@ Security
 --------
 All docker images are protected by [Polyverse](https://polyverse.io/) by scrambling the Linux packages. For more information please visit [this link](https://youtu.be/eSZNP42n-pM)

+Monitoring
+----------
+You can use [cadvisor](https://github.com/google/cadvisor) combined with influxdb / prometheus and grafana if needed to monitor each running container.
+
 Users
 -----
 Docker-Android are being used by 100+ countries around the world.
@@ -13,6 +13,15 @@ You can enable proxy inside container and Android emulator by passing following
 - NO_PROXY="localhost"
 - ENABLE_PROXY_ON_EMULATOR=true

+Proxy with authentication
+----
+
+You can set proxy with authentication by passing following environment variable:
+
+- HTTP_PROXY_USER="\<username>"
+- HTTPS_PROXY_PASSWORD="\<password>"
+
+
 Language
 --------

@@ -38,10 +38,19 @@ The following instructions are used for OS X. You'll need [docker-machine-parall
    ![Enable nested virtualization for Parallels Desktop](images/parallels_enable_nested_virtualization.png)

 4. Enable kvm inside virtual machine
+
+    4.0 Check kvm version
+    ```bash
+    # version
+    $ 10.1
+    ```
+    
+    Go to http://tinycorelinux.net/10.x/x86_64/tcz/ and check your kvm version, for version 10.1 is kvm-4.19.10-tinycore64.tcz
+    
    4.1. Run as an account other than root to install kvm packages using tce-load.
    ```bash
    # su docker
-    $ tce-load -wi kvm
+    $ tce-load -wi kvm-4.19.10-tinycore64.tcz
    ```

    4.2. Run as root to load kvm module after kvm packages install.
@@ -1,4 +1,4 @@
-FROM appium/appium:1.18.0-p0
+FROM appium/appium:1.20.0-p0

 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"

@@ -1,4 +1,4 @@
-FROM appium/appium:1.18.0-p0
+FROM appium/appium:1.20.0-p0

 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"

@@ -1,4 +1,4 @@
-FROM appium/appium:1.18.0-p0
+FROM appium/appium:1.20.0-p0

 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"

@@ -52,7 +52,16 @@ function enable_proxy_if_needed () {
        adb shell "content update --uri content://telephony/carriers --bind proxy:s:"0.0.0.0" --bind port:s:"0000" --where "mcc=310" --where "mnc=260""
        sleep 5
        adb shell "content update --uri content://telephony/carriers --bind proxy:s:"${p[0]}" --bind port:s:"${p[1]}" --where "mcc=310" --where "mnc=260""
-
+        
+        if [ ! -z "${HTTP_PROXY_USER}" ]; then
+          sleep 2
+          adb shell "content update --uri content://telephony/carriers --bind user:s:"${HTTP_PROXY_USER}" --where "mcc=310" --where "mnc=260""
+        fi
+        if [ ! -z "${HTTP_PROXY_PASSWORD}" ]; then
+          sleep 2
+          adb shell "content update --uri content://telephony/carriers --bind password:s:"${HTTP_PROXY_PASSWORD}" --where "mcc=310" --where "mnc=260""
+        fi
+        
        adb unroot

        # Mobile data need to be restarted for Android 10 or higher
Author	SHA1	Message	Date
butomo1989	1d7121c41b	Merge branch 'master' of github.com:butomo1989/docker-android	2021-01-08 08:34:25 +01:00
butomo1989	0a1758091f	Updated base image	2021-01-08 08:34:06 +01:00
Budi UtomoandGitHub	eb045aa644	Merge pull request #270 from jnvillar/patch-1 Update README_VMWARE.md	2021-01-07 10:42:00 +01:00
Juan Ignacio Noli VillarandGitHub	e5a9fe7031	Update README_VMWARE.md	2020-12-17 10:49:08 -03:00
butomo1989	fdb464781a	Added monitoring section	2020-09-02 11:33:07 +02:00
Budi UtomoandGitHub	2e5237ec80	Merge pull request #260 from yintro4ha/master Able to add proxy user and password on Android emulator	2020-08-27 12:56:15 +02:00
yintro4haandGitHub	b1f9ec5e79	Merge pull request #1 from yintro4ha/add-proxy-auth Update utils.sh	2020-08-24 15:14:00 +08:00
yintro4haandGitHub	1ac4a6484e	Update README_CUSTOM_CONFIG.md Add document for new proxy auth variable	2020-08-24 15:10:03 +08:00
yintro4haandGitHub	f09e38c92c	Update utils.sh Add Variable: 1. HTTP_PROXY_USER 2. HTTP_PROXY_PASSWORD	2020-08-24 15:05:22 +08:00