Merge pull request #226 from zebrunner/#221

#221: started adb with -a argument

Dockerfile

@@ -22,10 +22,13 @@ RUN mkdir -p $APPIUM_APPS_DIR && \
 	chown androidusr:androidusr $APPIUM_APPS_DIR
 
 # Android envs
+ENV ADB_PORT=5037
 ENV ANDROID_DEVICE=
 ENV ADB_POLLING_SEC=5
 ENV EXIT_ON_ADB_FAILURE=0
 
+ENV PROXY_PORT=8080
+
 ENV CHROMEDRIVER_AUTODOWNLOAD=true
 
 # Log settings

files/android.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# print all settings 
+adb shell getprop ro.build.characteristics
+
 # device type
 isTablet=`adb shell getprop ro.build.characteristics | grep tablet`
 isTv=`adb shell getprop ro.build.characteristics | grep tv`

local_connect.sh

@@ -42,7 +42,7 @@ fi
 # 2016-07-02 Due to internal ADB changes our previous start command no longer works in the latest version.
 # The command has been updated, but if you were specifying it yourself, make sure you're using adb -a -P 5037 server nodaemon.
 # Do NOT use the fork-server argument anymore.
-adb -a -P 5037 server nodaemon &
+adb -a -P $ADB_PORT server nodaemon &
 sleep 1
 
 # ADB connect (via wireless network or via tcp for redroid emulator)