Fix -proxy customization via SELENIUM_NODE_PROXY_PARAMS

Author: elgalu

CHANGELOG.md

@@ -7,6 +7,30 @@ Note image ids also change after scm-source.json has being updated which trigger
 ###### To get container versions
     docker exec grid versions
 
+## TBD_DOCKER_TAG
+ + Date: TBD_DATE
+ + Fix -proxy customization via SELENIUM_NODE_PROXY_PARAMS
+ + Image tag details:
+  + Selenium: vTBD_SELENIUM_VERSION (TBD_SELENIUM_REVISION)
+  + Chrome stable:  TBD_CHROME_STABLE
+  + Firefox stable: TBD_FIREFOX_STABLE
+  + Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
+  + Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
+  + Timezone: TBD_TIME_ZONE
+  + FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
+  + Python: TBD_PYTHON_VERSION
+  + Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
+  + BrowserStack Local version TBD_BROWSER_STACK_VERSION
+  + Tested on kernel dev host: 4.4.0-30-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.11.2, build b9f10c9
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+  + Built at dev host with: Docker Compose version 1.7.1, build 0a9ab35
+  + Built at CI  host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
+  + Image size: TBD_IMAGE_SIZE
+  + Digest: TBD_DIGEST
+  + Image ID: TBD_IMAGE_ID
+
 ## 2.53.1c
  + Date: 2016-07-04
  + Add node -proxy customization via SELENIUM_NODE_PROXY_PARAMS

CONTRIBUTING.md

@@ -8,19 +8,19 @@ For pull requests or local commits:
     open ./images/grid_console.png #to verify the versions are correct
     git checkout ./images/grid_console.png && open ./videos/chrome/test.mkv
     travis lint #if you changed .travis.yml
-    git checkout -b tmp-2.53.1c #name your branch according to your changes
+    git checkout -b tmp-2.53.1d #name your branch according to your changes
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Add node -proxy customization via SELENIUM_NODE_PROXY_PARAMS"
+    git commit -m "Fix -proxy customization via SELENIUM_NODE_PROXY_PARAMS"
     git tag -d latest #tag latest will be updated from TravisCI
-    git tag 2.53.1c && git push origin tmp-2.53.1c && git push --tags
+    git tag 2.53.1d && git push origin tmp-2.53.1d && git push --tags
 
 -- Wait for Travis to pass OK
 -- Make sure changes got merged into master by elgalubot
 
-    git checkout master && git pull && git branch -d tmp-2.53.1c && git push origin --delete tmp-2.53.1c
+    git checkout master && git pull && git branch -d tmp-2.53.1d && git push origin --delete tmp-2.53.1d
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- Upgrade release tag in github.com with latest CHANGELOG.md
@@ -37,9 +37,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 2.53.1c && git push origin :2.53.1c
+    git tag -d 2.53.1d && git push origin :2.53.1d
     #git add ...
-    git commit --amend && git tag 2.53.1c && git push --force origin tmp-2.53.1c && git push --tags
+    git commit --amend && git tag 2.53.1d && git push --force origin tmp-2.53.1d && git push --tags
 
 ## Docker push from Travis CI
 Travis [steps](https://docs.travis-ci.com/user/docker/#Pushing-a-Docker-Image-to-a-Registry) involve `docker login` and docker credentials encryptions.

TBD_DOCKER_TAG.md

@@ -12,7 +12,7 @@
   + Python: TBD_PYTHON_VERSION
   + Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
   + BrowserStack Local version TBD_BROWSER_STACK_VERSION
-  + Tested on kernel dev host: 4.4.0-29-generic x86_64
+  + Tested on kernel dev host: 4.4.0-30-generic x86_64
   + Tested on kernel CI  host: TBD_HOST_UNAME
   + Built at dev host with: Docker version 1.11.2, build b9f10c9
   + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD

bin/entry.sh

@@ -170,8 +170,10 @@ elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
   fi
 fi
 
-if [[ "${SELENIUM_NODE_PROXY_PARAMS}" != "" ]]; then
-  CUSTOM_SELENIUM_NODE_PROXY_PARAMS="-proxy ${SELENIUM_NODE_PROXY_PARAMS}"
+if [ "${SELENIUM_NODE_PROXY_PARAMS}" != "" ]; then
+  export CUSTOM_SELENIUM_NODE_PROXY_PARAMS="-proxy ${SELENIUM_NODE_PROXY_PARAMS}"
+else
+  export CUSTOM_SELENIUM_NODE_PROXY_PARAMS=""
 fi
 
 #----------------------------------------