From c1f5730a338ae0d6a4fc7b2c80ce5d56a04ef036 Mon Sep 17 00:00:00 2001
From: butomo1989 <budi.ut.1989@gmail.com>
Date: Tue, 28 Mar 2017 12:31:14 +0200
Subject: [PATCH] Using latest build-tool (25.0.2)

---
 release.sh       | 35 +++++++++++------------------------
 supervisord.conf | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/release.sh b/release.sh
index 358bc18..9f04f95 100644
--- a/release.sh
+++ b/release.sh
@@ -2,6 +2,7 @@
 # Bash version should >= 4 to be able to run this script.
 
 IMAGE="butomo1989/docker-android"
+LATEST_BUILD_TOOL=25.0.2
 
 if [ -z "$1" ]; then
     read -p "Environment (test|build|push|all) : " TASK
@@ -21,17 +22,16 @@ else
     PROCESSOR=$3
 fi
 
-function build_tool() {
-    declare -A build_tools=(
-        [5.0.1]=21.1.2
-        [5.1.1]=22.0.1
-        [6.0]=23.0.3
-        [7.0]=24.0.3
-        [7.1.1]=25.0.2
+function api_level() {
+    declare -A levels=(
+        [5.0.1]=21
+        [5.1.1]=22
+        [6.0]=23
+        [7.0]=24
+        [7.1.1]=25
     )
 
-    # TODO: Need to be sorted
-    for key in "${!build_tools[@]}"; do
+    for key in "${!levels[@]}"; do
         if [[ $key == *"$GIVEN_VERSION"* ]]; then
             version=$key
         fi
@@ -44,19 +44,6 @@ function build_tool() {
     fi
 
     echo "Android version: $version"
-    build_tools=${build_tools[$version]}
-    echo "Build tool: $build_tools"
-}
-
-function api_level() {
-    declare -A levels=(
-        [5.0.1]=21
-        [5.1.1]=22
-        [6.0]=23
-        [7.0]=24
-        [7.1.1]=25
-    )
-
     level=${levels[$version]}
     echo "Api level: $level"
 }
@@ -79,12 +66,12 @@ function system_image() {
 }
 
 function init() {
-    build_tool
     api_level
     system_image
 }
 
 init
+echo "Build tool: $build_tool"
 IMAGE_NAME="$IMAGE-$PROCESSOR-$version"
 echo "Image tag: $TAG"
 
@@ -97,7 +84,7 @@ function build() {
     # Remove pyc files
     find . -name "*.pyc" -exec rm -f {} \;
 
-    docker build -t $IMAGE_NAME --build-arg ANDROID_VERSION=$version --build-arg BUILD_TOOL=$$build_tools \
+    docker build -t $IMAGE_NAME --build-arg ANDROID_VERSION=$version --build-arg BUILD_TOOL=$LATEST_BUILD_TOOL \
         --build-arg API_LEVEL=$level --build-arg PROCESSOR=$PROCESSOR --build-arg SYS_IMG=$sys_img .
 }
 
diff --git a/supervisord.conf b/supervisord.conf
index 76c39a8..c05e261 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -5,26 +5,26 @@ childlogdir=%(ENV_LOG_PATH)s
 
 [program:xvfb]
 command=/usr/bin/Xvfb %(ENV_DISPLAY)s -screen %(ENV_SCREEN)s %(ENV_SCREEN_WIDTH)sx%(ENV_SCREEN_HEIGHT)sx%(ENV_SCREEN_DEPTH)s
-stdout_logfile=%(ENV_LOG_PATH)s/xvfb.log
-redirect_stderr=true
+stdout_logfile=%(ENV_LOG_PATH)s/xvfb.stdout.log
+stderr_logfile=%(ENV_LOG_PATH)s/xvfb.stderr.log
 
 [program:openbox]
 command=/usr/bin/openbox-session
-stdout_logfile=%(ENV_LOG_PATH)s/openbox.log
-redirect_stderr=true
+stdout_logfile=%(ENV_LOG_PATH)s/openbox.stdout.log
+stderr_logfile=%(ENV_LOG_PATH)s/openbox.stderr.log
 
 [program:x11vnc]
 command=/usr/bin/x11vnc -display %(ENV_DISPLAY)s -nopw -ncache 10 -forever
-stdout_logfile=%(ENV_LOG_PATH)s/x11vnc.log
-redirect_stderr=true
+stdout_logfile=%(ENV_LOG_PATH)s/x11vnc.stdout.log
+stderr_logfile=%(ENV_LOG_PATH)s/x11vnc.stderr.log
 
 [program:novnc]
 command=./noVNC/utils/launch.sh --vnc localhost:%(ENV_LOCAL_PORT)s --listen %(ENV_TARGET_PORT)s
-stdout_logfile=%(ENV_LOG_PATH)s/novnc.log
-redirect_stderr=true
+stdout_logfile=%(ENV_LOG_PATH)s/novnc.stdout.log
+stderr_logfile=%(ENV_LOG_PATH)s/novnc.stderr.log
 
 [program:docker-appium]
 command=python3 -m src.app
 autorestart=false
-stdout_logfile=%(ENV_LOG_PATH)s/docker-appium.log
-redirect_stderr=true
+stdout_logfile=%(ENV_LOG_PATH)s/docker-appium.stdout.log
+stderr_logfile=%(ENV_LOG_PATH)s/docker-appium.stderr.log