Using python 3.8.12 on pipeline

Dropped polyverse support
Merge pull request #314 from inez/patch-1
2026-07-31 04:07:25 +00:00 · 2022-04-08 12:45:34 +02:00 · 2022-04-08 12:35:43 +02:00 · 2022-02-16 10:42:41 +01:00 · 2021-12-22 16:38:23 -08:00 · 2021-11-17 13:59:23 +01:00
20 changed files with 222 additions and 176 deletions
@@ -1,30 +0,0 @@
-language: python
-
-python:
-  - "3.5"
-
-sudo: required
-
-services:
-  - docker
-
-install: "pip install -r requirements.txt"
-
-env:
-  - ANDROID_VERSION=5.0.1
-  - ANDROID_VERSION=5.1.1
-  - ANDROID_VERSION=6.0
-  - ANDROID_VERSION=7.0
-  - ANDROID_VERSION=7.1.1
-  - ANDROID_VERSION=8.0
-  - ANDROID_VERSION=8.1
-  - ANDROID_VERSION=9.0
-  - ANDROID_VERSION=10.0
-  - ANDROID_VERSION=11.0
-  - REAL_DEVICE=True
-  - GENYMOTION=True
-
-script: bash travis.sh
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
@@ -28,7 +28,7 @@ Docker-Android's analytics are sent throughout Docker-Android's execution to Goo
 Docker-Android's analytics are accessible to Docker-Android's current maintainers. Contact [@budtmo](https://github.com/budtmo) if you are a maintainer and need access.

 ## How?
-The code is viewable in [this lines](./src/appium.sh#L225-L247).
+The code is viewable in [this script](./src/appium.sh).

 ## 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.
@@ -4,11 +4,12 @@

 [![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/budtmo/docker-android](https://badges.gitter.im/budtmo/docker-android.svg)](https://gitter.im/budtmo/docker-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/budtmo/docker-android.svg?branch=master)](https://travis-ci.org/budtmo/docker-android)
+[![Build Status](https://dev.azure.com/budtmoos/budtmoos/_apis/build/status/budtmo.docker-android.test?branchName=master)](https://dev.azure.com/budtmoos/budtmoos/_build/latest?definitionId=7&branchName=master)
 [![codecov](https://codecov.io/gh/budtmo/docker-android/branch/master/graph/badge.svg)](https://codecov.io/gh/budtmo/docker-android)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3f000ffb97db45a59161814e1434c429)](https://www.codacy.com/app/butomo1989/docker-appium?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=butomo1989/docker-appium&amp;utm_campaign=Badge_Grade)
 [![GitHub release](https://img.shields.io/github/release/budtmo/docker-android.svg)](https://github.com/budtmo/docker-android/releases)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbudtmo%2Fdocker-android?ref=badge_shield)
+[![Paypal Donate](https://img.shields.io/badge/paypal-donate-blue.svg)](http://paypal.me/budtmo)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)

 Docker-Android is a docker image built to be used for everything related to mobile website testing and Android project.
@@ -43,8 +44,6 @@ List of Docker images

 |OS   |Android   |API   |Browser   |Browser version   |Chromedriver   |Image   |Size   |
 |:---|:---|:---|:---|:---|:---|:---|:---|
-|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")|
@@ -53,6 +52,7 @@ List of Docker images
 |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")|
+|Linux|12.0|31|chrome|93.0|93.0.4577.15|budtmo/docker-android-x86-12.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-12.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-12.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")|

@@ -81,7 +81,14 @@ Docker is installed in your system.
 Quick Start
 -----------

-1. Run Docker-Android
+1. Your machine need to support virtualization. To check it:
+
+	```
+	sudo apt install cpu-checker
+	kvm-ok
+	```
+
+2. Run Docker-Android

 	- For ***Linux OS***, please use image name that contains "x86"

@@ -92,7 +99,7 @@ Quick Start
 	- For ***OSX*** and ***Windows OS***, please use Virtual Machine that support Virtualization with Ubuntu OS


-2. Verify the ip address of docker host.
+3. Verify the ip address of docker host.

   - For OSX, you can find out by using following command:

@@ -102,12 +109,12 @@ Quick Start

   - For different OS, localhost should work.

-3. Open ***http://docker-host-ip-address:6080*** from web browser. Note: Adding ```?view_only=true``` will give user only view only permission.
+4. Open ***http://docker-host-ip-address:6080*** from web browser. Note: Adding ```?view_only=true``` will give user only view only permission.

 Custom configurations
 ---------------------

-[This document](README_CUSTOM_CONFIG.md) contains custom configurations of Docker-Android that you might need, e.g. Proxy, Changing language on fly, etc. 
+[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
 ---------------------
@@ -125,31 +132,31 @@ Docker-Android can be used for building Android project and executing its unit t
    ```bash
    docker run -it --rm -v $PWD/testing-samples/ui/espresso/BasicSample:/tmp -w /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 
+1. Create a docker container with this command

 	```
 	$ docker run --privileged -d -p 6080:6080 -p 5554:5554 -p 5555:5555 -p 4723:4723 --name android-container-appium budtmo/docker-android-real-device
 	```
-	
+
 2. Open noVNC [http://localhost:6080](http://localhost:6080)

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

-4. To connect to host's adb (make sure your host have adb and connected to the device.) 
+4. To connect to host's adb (make sure your host have adb and connected to the device.)

 	```
 	$ adb -H host.docker.internal devices
 	```
-	
+
 	To specify port, just add `-P port_number`

 	```
 	$ adb -H host.docker.internal -P 5037 devices
 	```
-	
+
 5. Now your container can access your host devices. But, you need to add `remoteAdbHost` and `adbPort` desired capabilities to make **Appium** can recognise those devices.  


@@ -245,17 +252,23 @@ docker exec -it android-container tail -f /var/log/supervisor/docker-android.std

 Emulator Skins
 --------------
-The Emulator skins are taken from [Android Studio IDE](https://developer.android.com/studio) and [Samsung Developer Website](e)
+The Emulator skins are taken from [Android Studio IDE](https://developer.android.com/studio) and [Samsung Developer Website](https://developer.samsung.com/)

-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/)
+
+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.

-[![ga-datastudio-docker-android](./images/users.png)](https://datastudio.google.com/s/ht7HVKHKAQE)
+[![ga-datastudio-docker-android](./images/docker-android_users.png)](https://datastudio.google.com/s/ht7HVKHKAQE)
+
+Stargazers over time
+--------------------
+
+[![Stargazers over time](https://starchart.cc/budtmo/docker-android.svg)](https://starchart.cc/budtmo/docker-android)

 Special Thanks
 --------------
@@ -25,6 +25,7 @@ It is also possible to connect appium server that run inside docker-android with
 - SELENIUM_HOST="\<host\_ip\_address>"
 - SELENIUM_PORT=\<port\_number>
 - SELENIUM_TIMEOUT=\<timeout\_in\_seconds>
+- SELENIUM_PROXY_CLASS=\<selenium\_proxy\_class\_name>

 To run tests for mobile browser, following parameter can be passed:

@@ -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>"
+- HTTP_PROXY_PASSWORD="\<password>"
+
+
 Language
 --------

@@ -38,23 +38,37 @@ 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.1. Run as an account other than root to install kvm packages using tce-load.
+
+    4.0 SSH to the machine
    ```bash
-    # su docker
-    $ tce-load -wi kvm
+    docker-machine ssh vmware-dev
    ```

-    4.2. Run as root to load kvm module after kvm packages install.
+    4.1 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.2. Run as an account other than root to install kvm packages using tce-load.
+    ```bash
+    # su docker
+    $ tce-load -wi kvm-4.19.10-tinycore64.tcz
+    ```
+
+    4.3. 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.
+    4.4. Check if the kvm device is loaded.
    ```bash
    $ ls /dev/kvm
    ```

-    4.4. Check if your CPU supports hardware virtualization now
+    4.5. Check if your CPU supports hardware virtualization now
    ```bash
    $ egrep -c '(vmx|svm)' /proc/cpuinfo
    ```
@@ -1,4 +1,4 @@
-FROM appium/appium:1.17.1-p1
+FROM appium/appium:v1.22.0-p0

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

@@ -7,18 +7,6 @@ LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 #=============
 WORKDIR /root

-#===========
-# Polyverse
-# https://polyverse.io/how-it-works/
-#===========
-ARG TOKEN=xxx
-
-RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \
-    if [ $? -eq 0 ]; then \
-      apt -y update && \
-      apt-get -y install --reinstall $(dpkg --get-selections | awk '{print $1}'); \
-    fi
-
 #==================
 # General Packages
 #------------------
@@ -1,4 +1,4 @@
-FROM appium/appium:1.17.1-p1
+FROM appium/appium:v1.22.0-p0

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

@@ -7,18 +7,6 @@ LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 #=============
 WORKDIR /root

-#===========
-# Polyverse
-# https://polyverse.io/how-it-works/
-#===========
-ARG TOKEN=xxx
-
-RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \
-    if [ $? -eq 0 ]; then \
-      apt -y update && \
-      apt-get -y install --reinstall $(dpkg --get-selections | awk '{print $1}'); \
-    fi
-
 #==================
 # General Packages
 #------------------
@@ -1,4 +1,4 @@
-FROM appium/appium:1.17.1-p1
+FROM appium/appium:v1.22.0-p0

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

@@ -7,18 +7,6 @@ LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 #=============
 WORKDIR /root

-#===========
-# Polyverse
-# https://polyverse.io/how-it-works/
-#===========
-ARG TOKEN=xxx
-
-RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \
-    if [ $? -eq 0 ]; then \
-      apt -y update && \
-      apt-get -y install --reinstall $(dpkg --get-selections | awk '{print $1}'); \
-    fi
-
 #==================
 # General Packages
 #------------------
@@ -0,0 +1,51 @@
+trigger:
+  tags:
+    include:
+    - v*
+
+jobs:
+- job: build_and_release_emulators
+  pool:
+    vmImage: ubuntu-20.04
+  strategy:
+    maxParallel: 10
+    matrix:
+      6.0:
+        android.version: '6.0'
+      7.0:
+        android.version: '7.0'
+      7.1.1:
+        android.version: '7.1.1'
+      8.0:
+        android.version: '8.0'
+      8.1:
+        android.version: '8.1'
+      9.0:
+        android.version: '9.0'
+      10.0:
+        android.version: '10.0'
+      11.0:
+        android.version: '11.0'
+      12.0:
+        android.version: '12.0'
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.8.12'
+      displayName: 'Use Python 3.8.12'
+
+  - script: |
+      latest_tag=$(git describe --tags --abbrev=0)
+      echo "##vso[task.setvariable variable=release_version]$latest_tag"
+
+    displayName: 'Get the latest release tag'
+
+  - script: |
+      docker login -u $(DOCKER_USERNAME) -p=$(DOCKER_PASSWORD)
+      ./release.sh all $(android.version) $(release_version)
+      docker logout
+
+    displayName: 'Build docker image, run unit tests and push the docker image'
+
+  - script: bash <(curl -s https://codecov.io/bash)
+    displayName: 'Publish test result'
@@ -0,0 +1,37 @@
+trigger:
+  tags:
+    include:
+    - v*
+
+jobs:
+- job: build_and_release_genymotion_and_device
+  pool:
+    vmImage: ubuntu-20.04
+  strategy:
+    maxParallel: 2
+    matrix:
+      genymotion:
+        script.name: './release_real.sh'
+      real_device:
+        script.name: './release_geny.sh'
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.8.12'
+      displayName: 'Use Python 3.8.12'
+
+  - script: |
+      latest_tag=$(git describe --tags --abbrev=0)
+      echo "##vso[task.setvariable variable=release_version]$latest_tag"
+
+    displayName: 'Get the latest release tag'
+
+  - script: |
+      docker login -u $(DOCKER_USERNAME) -p=$(DOCKER_PASSWORD)
+      $(script.name) all $(release_version)
+      docker logout
+
+    displayName: 'Build docker image, run unit tests and push the docker image'
+
+  - script: bash <(curl -s https://codecov.io/bash)
+    displayName: 'Publish test result'
@@ -0,0 +1,29 @@
+trigger:
+  branches:
+    include:
+    - master
+
+pr:
+  branches:
+    include:
+    - '*'
+
+variables:
+  - name: app_version
+    value: test
+
+jobs:
+- job: build_and_test
+  pool:
+    vmImage: ubuntu-20.04
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.8.12'
+      displayName: 'Use Python 3.8.12'
+  - script: pip install -r requirements.txt
+    displayName: 'Install pip packages'
+  - script: ./release.sh test 7.1.1 $(app_version) 
+    displayName: 'Build Docker image with Android 7.1.1 and run unit tests'
+  - script: bash <(curl -s https://codecov.io/bash)
+    displayName: 'Publish test result'
@@ -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|11.0|all): " ANDROID_VERSION
+    read -p "Android version (6.0|7.0|7.1.1|8.0|8.1|9.0|10.0|11.0|12.0|all): " ANDROID_VERSION
 else
    ANDROID_VERSION=$2
 fi
@@ -22,8 +22,6 @@ else
 fi

 declare -A list_of_levels=(
-        [5.0.1]=21
-        [5.1.1]=22
        [6.0]=23
        [7.0]=24
        [7.1.1]=25
@@ -32,13 +30,12 @@ declare -A list_of_levels=(
        [9.0]=28
        [10.0]=29
        [11.0]=30
+        [12.0]=31
 )

 # 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.21"
-        [5.1.1]="2.13"
        [6.0]="2.18"
        [7.0]="2.23"
        [7.1.1]="2.28"
@@ -47,6 +44,7 @@ declare -A chromedriver_versions=(
        [9.0]="2.40"
        [10.0]="74.0.3729.6"
        [11.0]="83.0.4103.39"
+        [12.0]="93.0.4577.15"
 )

 function get_android_versions() {
@@ -66,7 +64,7 @@ function get_android_versions() {

    # If version cannot be found in the list
    if [ -z "$versions" ]; then
-        echo "Android version \"$ANDROID_VERSION\" is not found in the list or not supported! Support only version 5.0.1, 5.1.1, 6.0, 7.0, 7.1.1, 8.0, 8.1"
+        echo "Android version \"$ANDROID_VERSION\" is not found in the list or not supported! Support only version 6.0, 7.0, 7.1.1, 8.0, 8.1, 9.0, 10.0, 11.0, 12.0"
        exit 1
    fi

@@ -141,27 +139,27 @@ function build() {
    FILE_NAME=docker/Emulator_x86

    for v in "${versions[@]}"; do
+        level=${list_of_levels[$v]}
+
        # Find image type and default web browser
-        if [ "$v" == "5.0.1" ] || [ "$v" == "5.1.1" ]; then
-            IMG_TYPE=default
-            BROWSER=browser
-        elif [ "$v" == "6.0" ]; then
+        if [ "$v" == "6.0" ]; then
            # 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            
+            BROWSER=chrome
        else
-            #adb root cannot be run in IMG_TYPE=google_apis_playstore 
+            #adb root cannot be run in IMG_TYPE=google_apis_playstore
            IMG_TYPE=google_apis
            BROWSER=chrome
-            if [ "$v" == "9.0" ]; then
+            # Android 9 & Android 11 had build issues that requires 64-bit
+            # Android 12+ Google dropped 32-bit support
+            if [ "$v" == "9.0" ] || [ $level -ge 30 ]; then
                processor=x86_64
            fi
        fi
        echo "[BUILD] IMAGE TYPE: $IMG_TYPE"
-        level=${list_of_levels[$v]}
        echo "[BUILD] API Level: $level"
        sys_img=$processor
        echo "[BUILD] System Image: $sys_img"
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-IMAGE_NAME="budtmo/docker-android"
-
-if [ -z "$1" ]; then
-    read -p "Type : " TYPE
-else
-    TYPE=$1
-fi
-
-if [ -z "$2" ]; then
-    read -p "Version : " VERSION
-else
-    VERSION=$2
-fi
-
-declare -a versions=("7.1.1" "7.0" "6.0" "5.1.1" "5.0.1")
-
-## now loop through the above array
-for v in "${versions[@]}"
-do
-	IMAGE="$IMAGE_NAME-$TYPE-$v"
-	IMAGE_OLD="$IMAGE:$VERSION"
-	IMAGE_LATEST="$IMAGE:latest"
-	echo "Revert image \"$IMAGE_LATEST\" to version \"$IMAGE_OLD\""
-	docker pull $IMAGE_OLD
-	docker tag $IMAGE_OLD $IMAGE_LATEST
-	docker push $IMAGE_LATEST
-done
@@ -3,6 +3,7 @@
 import json
 import logging
 import os
+import re
 import subprocess
 import uuid

@@ -56,7 +57,7 @@ def is_initialized(device_name) -> bool:
    if os.path.exists(config_path):
        logger.info('Found existing config file at {}.'.format(config_path))
        with open(config_path, 'r') as f:
-            if any('hw.device.name={}'.format(device_name) in line for line in f):
+            if any(re.match(r'hw\.device\.name ?= ?{}'.format(device_name), line) for line in f):
                logger.info('Existing config file references {}. Assuming device was previously initialized.'.format(device_name))
                return True
            else:
@@ -149,9 +150,10 @@ def appium_run(avd_name: str):
            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))
+            selenium_proxy_class = os.getenv('SELENIUM_PROXY_CLASS', 'org.openqa.grid.selenium.proxy.DefaultRemoteProxy')
            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,
-                               selenium_timeout)
+                               selenium_timeout, selenium_proxy_class)
            cmd += ' --nodeconfig {file}'.format(file=CONFIG_FILE)
        except ValueError as v_err:
            logger.error(v_err)
@@ -160,7 +162,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_timeout: int):
+                       selenium_port: int, selenium_timeout: int, selenium_proxy_class: str):
    """
    Create custom node config file in json format to be able to connect with selenium server.

@@ -170,6 +172,7 @@ def create_node_config(avd_name: str, browser_name: str, appium_host: str, appiu
    :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
+    :param selenium_proxy_class: Selenium Proxy class created in Selenium hub
    """
    config = {
        'capabilities': [
@@ -185,11 +188,11 @@ def create_node_config(avd_name: str, browser_name: str, appium_host: str, appiu
        'configuration': {
            'cleanUpCycle': 2000,
            'timeout': selenium_timeout,
-            'proxy': 'org.openqa.grid.selenium.proxy.DefaultRemoteProxy',
+            'proxy': selenium_proxy_class,
            'url': 'http://{host}:{port}/wd/hub'.format(host=appium_host, port=appium_port),
            'host': appium_host,
            'port': appium_port,
-            'maxSession': 6,
+            'maxSession': 1,
            'register': True,
            'registerCycle': 5000,
            'hubHost': selenium_host,
@@ -58,7 +58,8 @@ 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, 30)
+        app.create_node_config('test', 'android', '127.0.0.1', 4723, '127.0.0.1', 4444, 30,
+                               'org.openqa.grid.selenium.proxy.DefaultRemoteProxy')
        self.assertTrue(os.path.exists(CONFIG_FILE))
        os.remove(CONFIG_FILE)

@@ -31,13 +31,6 @@ function install_google_play () {
  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"
-}
-
 function enable_proxy_if_needed () {
  if [ "$ENABLE_PROXY_ON_EMULATOR" = true ]; then
    if [ ! -z "${HTTP_PROXY// }" ]; then
@@ -56,9 +49,24 @@ function enable_proxy_if_needed () {
        adb root

        echo "Set up the Proxy"
+        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
+        adb shell svc data disable
+        adb shell svc data enable
      else
        echo "Please use http:// in the beginning!"
      fi
@@ -69,9 +77,8 @@ function enable_proxy_if_needed () {
  fi
 }

-enable_proxy_if_needed
-sleep 1
 change_language_if_needed
 sleep 1
+enable_proxy_if_needed
+sleep 1
 install_google_play
-disable_animation
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Bash version should >= 4 to be able to run this script.
-
-if [ -z "$TRAVIS_TAG" ]; then
-    echo "UNIT TEST ONLY"
-    bash release.sh test all all 0.1
-else
-    if [ ! -z "$ANDROID_VERSION" ]; then
-      echo "Log in to docker hub"
-      docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-      echo "[Version: $ANDROID_VERSION] RUN UNIT TEST, BUILD DOCKER IMAGES AND PUSH THOSE TO DOCKER HUB"
-      bash release.sh all $ANDROID_VERSION $TRAVIS_TAG
-    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
-fi
Author	SHA1	Message	Date
budtmo	a72a5d1edc	Using python 3.8.12 on pipeline	2022-04-08 12:45:34 +02:00
budtmo	9f58ad6bda	Dropped polyverse support	2022-04-08 12:35:43 +02:00
Budi UtomoandGitHub	94a3f40ac6	Merge pull request #314 from inez/patch-1 (documentation) Added information about SSHing to the virtual machine	2022-02-16 10:42:41 +01:00
Inez KorczyńskiandGitHub	e340223c8c	Add information about SSHing to the virtual machine	2021-12-22 16:38:23 -08:00
Budi UtomoandGitHub	77488aea7f	Merge pull request #310 from JoelWhitney/joel/android-11-x86_64 Android 11 build issue with 32-bit image	2021-11-17 13:59:23 +01:00
Budi UtomoandGitHub	8f1c4bf1ca	Merge branch 'master' into joel/android-11-x86_64	2021-11-17 11:45:03 +01:00
Budi UtomoandGitHub	cd63313358	Changed polymorphing llink	2021-11-10 15:03:48 +01:00
Joel Whitney	d0f9534e3d	Android 11 build issue with 32-bit image	2021-11-04 13:02:32 -04:00
budtmo	7b6bc3fe3e	Removed support for Android 5.0.1 and 5.1.1	2021-10-05 10:06:46 +02:00
budtmo	1f1d4ccf49	Using the latest appium version	2021-10-05 10:03:43 +02:00
Budi UtomoandGitHub	8278a3f6ef	Merge pull request #303 from syntx/patch-1 Update README_CUSTOM_CONFIG.md	2021-10-05 10:01:38 +02:00
syntxandGitHub	92ea480e55	Update README_CUSTOM_CONFIG.md This seems like a typo in the documentation, according to: https://github.com/budtmo/docker-android/blob/0a8b7c07a2659fe9bd316bac8c21c506f953620a/src/utils.sh#L60-L62	2021-10-04 23:55:29 +03:00
budtmo	0188131350	Replaced operator	2021-08-05 13:28:43 +02:00
budtmo	371a57c663	Added Android 12.0 into pipeline	2021-08-05 12:28:04 +02:00
Budi UtomoandGitHub	6d4de35602	Merge pull request #297 from JoelWhitney/android_12 Support Android 12 (API 31)	2021-08-05 12:24:47 +02:00
Joel Whitney	51158d8630	processor	2021-08-03 18:04:53 -04:00
Joel Whitney	3a7cba3dc9	x86_64	2021-08-03 17:16:21 -04:00
Joel Whitney	4bb9f044ed	12	2021-08-03 16:15:59 -04:00
budtmo	0e35dab27f	Updated base image	2021-07-20 17:21:42 +02:00
Budi UtomoandGitHub	14a98aea88	Merge pull request #294 from ireneu/master Check correctly if device exists	2021-07-20 17:17:57 +02:00
IreandGitHub	337aaf5103	Use regex to verify config	2021-07-09 14:20:52 +02:00
IreandGitHub	f5e86d5806	Check correctly if device exists config.ini has spaces around the equals sign	2021-07-09 10:56:29 +02:00
budtmo	caf2cb2cd8	Fixed pip issue on Azure DevOps	2021-06-21 12:15:51 +02:00
budtmo	03f2ea256a	Fixed wrong name	2021-06-21 12:10:18 +02:00
budtmo	af2d302bbc	Formatted	2021-06-21 11:45:36 +02:00
budtmo	b6752ea535	Renamed	2021-06-21 11:42:05 +02:00
budtmo	06a8e83922	Updated base image	2021-06-21 11:40:22 +02:00
budtmo	a7e7eaa5aa	Added release pipelines	2021-06-21 11:39:10 +02:00
budtmo	d2c82d05c7	Removed matrix from pipeline	2021-06-21 10:47:09 +02:00
budtmo	79d36e1536	Replaced status badge of Travis with Azure DevOps	2021-06-21 10:36:05 +02:00
budtmo	90ff1782ae	Reverted the changes	2021-06-21 10:33:07 +02:00
budtmo	92e4933521	Published test result at the end	2021-06-21 10:25:54 +02:00
budtmo	4f9469db55	Added matrix	2021-06-21 10:24:06 +02:00
budtmo	cc409b9914	Formatted	2021-06-21 10:18:02 +02:00
budtmo	4cc5a36c32	Added Azure DevOps	2021-06-21 10:13:15 +02:00
budtmo	ed77303a16	Removed travis from the project	2021-06-21 10:11:34 +02:00
budtmo	5696fe3ea0	Deleted unused script	2021-06-21 09:54:57 +02:00
Budi UtomoandGitHub	b39a8784b7	Merge pull request #287 from scottwallacesh/master Fix an issue when attempting to detect an existing AVD image	2021-06-21 09:52:26 +02:00
Scott WallaceandGitHub	fcb1f2ec31	Fix an issue when attempting to detect an existing AVD image Fixes #286.	2021-05-05 10:04:46 +01:00
Budi UtomoandGitHub	49113f2cb4	Added PayPal link for donation	2021-04-28 15:00:12 +02:00
Budi UtomoandGitHub	0a8b7c07a2	Added step how to check kvm	2021-02-16 15:40:39 +01:00
butomo1989	49b9c44f3a	Using Appium 1.20.2	2021-02-04 08:31:13 +01:00
butomo1989	15cddf08c4	Merge branch 'master' of github.com:butomo1989/docker-android	2021-02-03 16:55:06 +01:00
butomo1989	71949ee857	Using Appium 1.20.1	2021-02-03 16:54:51 +01:00
Budi UtomoandGitHub	d0e3c619ca	Merge pull request #277 from iqalab-cloud/bug-fix-incorrect-max-session Bug fix: maxSession in appium config should be 1	2021-01-13 13:07:30 +01:00
Zhaopeng XUAN	8dc87a3a3c	Bug fix: maxSession in appium config should be 1	2021-01-13 12:39:36 +01:00
Budi UtomoandGitHub	76617374c0	Merge pull request #274 from iqalab-cloud/feature-support-selenium-proxy-class Feature: Support customised Selenium Proxy Class when use Appium	2021-01-09 11:21:30 +01:00
Zhaopeng XUAN	70fc3b411c	Fix the issue	2021-01-08 12:05:34 +01:00
Zhaopeng XUAN	5e7ce8ce66	Feature: Support Selenium Proxy Class when use Appium	2021-01-08 11:44:56 +01:00
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
butomo1989	e051faf84a	Updated the base image	2020-07-31 10:51:08 +02:00
butomo1989	2461a6e832	Restart mobile data for specific version	2020-07-23 17:26:36 +02:00
butomo1989	20120f5c0a	Added stargazers	2020-07-22 09:12:27 +02:00
butomo1989	6a0f135247	Typo	2020-07-17 14:59:21 +02:00
butomo1989	b36847817d	Enable Animation	2020-07-17 14:58:17 +02:00
butomo1989	0196d23103	Switched the order because of bug on Android 10 or higher	2020-07-17 14:57:20 +02:00
butomo1989	01d1c663c1	Updated documentation	2020-07-14 09:54:31 +02:00
butomo1989	5b8ef77bba	Updated link	2020-07-14 09:53:05 +02:00
butomo1989	3b3746fff3	Updated security link	2020-07-14 09:52:38 +02:00
butomo1989	d9ba33c9fa	Renamed	2020-07-14 09:50:31 +02:00
butomo1989	94132acf41	Updated user statistics	2020-07-14 09:47:13 +02:00
butomo1989	86e7e0f8e5	Updated ga lines	2020-07-13 14:59:51 +02:00