Add node -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
+ + Add node -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-29-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.1b
  + Date: 2016-07-01
  + Fix race conditions while using many nodes with docker-compose

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.1b #name your branch according to your changes
+    git checkout -b tmp-2.53.1c #name your branch according to your changes
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "Fix race conditions while using many nodes with docker-compose"
+    git commit -m "Add node -proxy customization via SELENIUM_NODE_PROXY_PARAMS"
     git tag -d latest #tag latest will be updated from TravisCI
-    git tag 2.53.1b && git push origin tmp-2.53.1b && git push --tags
+    git tag 2.53.1c && git push origin tmp-2.53.1c && 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.1b && git push origin --delete tmp-2.53.1b
+    git checkout master && git pull && git branch -d tmp-2.53.1c && git push origin --delete tmp-2.53.1c
 
 -- 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.1b && git push origin :2.53.1b
+    git tag -d 2.53.1c && git push origin :2.53.1c
     #git add ...
-    git commit --amend && git tag 2.53.1b && git push --force origin tmp-2.53.1b && git push --tags
+    git commit --amend && git tag 2.53.1c && git push --force origin tmp-2.53.1c && 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.

Dockerfile

@@ -963,6 +963,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   # Selenium additional params:
   SELENIUM_HUB_PARAMS="" \
   SELENIUM_NODE_PARAMS="" \
+  SELENIUM_NODE_PROXY_PARAMS="" \
   # To taggle issue #58 see https://goo.gl/fz6RTu
   CHROME_ARGS="--no-sandbox" \
   # e.g. CHROME_ARGS="--no-sandbox --ignore-certificate-errors" \

bin/entry.sh

@@ -170,6 +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}"
+fi
+
 #----------------------------------------
 # Remove lock files, thanks @garagepoort
 # clear_x_locks.sh

docs/docker-compose.md

@@ -10,7 +10,7 @@ Either clone this repository or download the file [docker-compose.yml](../docker
     wget -nv "https://raw.githubusercontent.com/elgalu/docker-selenium/master/docker-compose.yml"
 
 ### Run
-Either start with `docker-compose up` and `scale` later or scale directly and run in daemon mode:
+Either start with `docker-compose ... scale` as shown in below example or you can also use `docker-compose up` and scale after in a second command.
 
     SELENIUM_HUB_PORT=4444 docker-compose -p selenium scale hub=1 chrome=3 firefox=3
 

misc/misc.md

@@ -2,8 +2,8 @@ Miscellaneous internal notes, do not read!
 
 ## Build
 
-    time (docker build -t elgalu/selenium:local . ;echo $?;beep)
-    docker run --rm -ti -m 3000M --name=local -p=4444:24444 -p=5900:25900 -e VIDEO=true -v /dev/shm:/dev/shm elgalu/selenium:local
+    time (docker build -t elgalu/selenium . ;echo $?;beep)
+    docker run --rm -ti -m 3000M --name=local -p=4444:24444 -p=5900:25900 -e VIDEO=true -v /dev/shm:/dev/shm elgalu/selenium
 
 ### Wait
 Wait and get versions
@@ -25,9 +25,9 @@ Push setup, first time only:
 
 Build a grid with extra nodes
 
-    docker run --rm --name=local -p 4444:24444 -p 5900:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium:local
+    docker run --rm --name=local -p 4444:24444 -p 5900:25900 -v /dev/shm:/dev/shm -e VNC_PASSWORD=hola elgalu/selenium
 
-    docker run --rm --name=node -e DISP_N=13 -e SSHD_PORT=22223 -e SUPERVISOR_HTTP_PORT=29003 -e VNC_PORT=25903 -e SELENIUM_NODE_CH_PORT=25330 -e SELENIUM_NODE_FF_PORT=25331 -e GRID=false -e CHROME=true -e FIREFOX=true --net=container:local elgalu/selenium:local
+    docker run --rm --name=node -e DISP_N=13 -e SSHD_PORT=22223 -e SUPERVISOR_HTTP_PORT=29003 -e VNC_PORT=25903 -e SELENIUM_NODE_CH_PORT=25330 -e SELENIUM_NODE_FF_PORT=25331 -e GRID=false -e CHROME=true -e FIREFOX=true --net=container elgalu/selenium
 
 See logs
 
@@ -54,18 +54,18 @@ List firefox versions via docker exe
 
 ## To update image id and digest
 
-    docker inspect -f='{{.Id}}' elgalu/selenium:local
+    docker inspect -f='{{.Id}}' elgalu/selenium
     docker images --digests
 
 ## Run with shared dir
 
     docker run --rm --name=local -p=127.0.0.1:4460:24444 -p=127.0.0.1:5910:25900 \
-      -v /e2e/uploads:/e2e/uploads elgalu/selenium:local
+      -v /e2e/uploads:/e2e/uploads elgalu/selenium
     docker run --rm --name=local -p=4460:24444 -p=5910:25900 \
-      -v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium:local
+      -v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) elgalu/selenium
 
 
-    docker run --rm --name=ff -p=127.0.0.1:4461:24444 -p=127.0.0.1:5911:25900 -v /e2e/uploads:/e2e/uploads elgalu/selenium:local
+    docker run --rm --name=ff -p=127.0.0.1:4461:24444 -p=127.0.0.1:5911:25900 -v /e2e/uploads:/e2e/uploads elgalu/selenium
 
 ## Run without shared dir and bind ports to all network interfaces
 
@@ -88,11 +88,11 @@ List firefox versions via docker exe
 ## Run without dir and bind to all interfaces
 Note anything after the image will be taken as arguments for the cmd/entrypoint
 
-    docker run --rm --name=local -p=0.0.0.0:8813:8484 -p=0.0.0.0:2222:2222 -p=0.0.0.0:4470:24444 -p=0.0.0.0:5900:25900 -e SCREEN_WIDTH=1800 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium:local
+    docker run --rm --name=local -p=0.0.0.0:8813:8484 -p=0.0.0.0:2222:2222 -p=0.0.0.0:4470:24444 -p=0.0.0.0:5900:25900 -e SCREEN_WIDTH=1800 -e SCREEN_HEIGHT=1110 -e VNC_PASSWORD=hola -e SSH_AUTH_KEYS="$(cat ~/.ssh/id_rsa.pub)" elgalu/selenium
 
-    docker run --rm --name=local -p=4470:24444 -p=5900:25900 -e VNC_PASSWORD=hola elgalu/selenium:local
-    docker run --rm --name=local -p=4470:24444 -p=5900:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium:local
-    docker run --rm --name=local -p=0.0.0.0:4470:24444 -p=0.0.0.0:5900:25900 --add-host myserver.dev:172.17.42.1 elgalu/selenium:local
+    docker run --rm --name=local -p=4470:24444 -p=5900:25900 -e VNC_PASSWORD=hola elgalu/selenium
+    docker run --rm --name=local -p=4470:24444 -p=5900:25900 -e VNC_PASSWORD=hola docker.io/elgalu/selenium
+    docker run --rm --name=local -p=0.0.0.0:4470:24444 -p=0.0.0.0:5900:25900 --add-host myserver.dev:172.17.42.1 elgalu/selenium
 
 However adding a custom host IP to server-selenium.local (e.g. bsele ssh config) is more work:
 
@@ -101,18 +101,18 @@ However adding a custom host IP to server-selenium.local (e.g. bsele ssh config)
 
     vncv localhost:5900 -Scaling=60%  &
 
-    docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium:local
+    docker run --rm --name=ff -p=0.0.0.0:4471:24444 -p=0.0.0.0:5921:25900 elgalu/selenium
 
 Automatic builds not working for me right now, maybe there is an issue with docker registry v1 vs v2
 https://registry.hub.docker.com/u/elgalu/docker-selenium/builds_history/31621/
 
 ## Pulling
 
-    docker pull registry.hub.docker.com/elgalu/selenium:local
+    docker pull registry.hub.docker.com/elgalu/selenium
 
 ## Pull
 
-    docker run -d --name=max -p=0.0.0.0:4411:24444 -p=0.0.0.0:5911:25900 elgalu/selenium:local
+    docker run -d --name=max -p=0.0.0.0:4411:24444 -p=0.0.0.0:5911:25900 elgalu/selenium
 
 How to connect through vnc (need a vnc client)
 

selenium-node-chrome/bin/start-selenium-node-chrome.sh

@@ -26,7 +26,8 @@ java ${JAVA_OPTS} \
   -cleanUpCycle ${SEL_CLEANUPCYCLE_MS} \
   -nodePolling ${SEL_NODEPOLLING_MS} \
   -Dwebdriver.chrome.driver="${SEL_HOME}/chromedriver" \
-  ${SELENIUM_NODE_PARAMS}
+  ${SELENIUM_NODE_PARAMS} \
+  ${CUSTOM_SELENIUM_NODE_PROXY_PARAMS}
 
 # Note to double pipe output and keep this process logs add at the end:
 #  2>&1 | tee $SELENIUM_LOG

selenium-node-firefox/bin/start-selenium-node-firefox.sh

@@ -26,7 +26,8 @@ java ${JAVA_OPTS} \
   -browserTimeout ${SEL_BROWSER_TIMEOUT_SECS} \
   -cleanUpCycle ${SEL_CLEANUPCYCLE_MS} \
   -nodePolling ${SEL_NODEPOLLING_MS} \
-  ${SELENIUM_NODE_PARAMS}
+  ${SELENIUM_NODE_PARAMS} \
+  ${CUSTOM_SELENIUM_NODE_PROXY_PARAMS}
 
 # Note to double pipe output and keep this process logs add at the end:
 #  2>&1 | tee $SELENIUM_LOG

test/before_install_docker_linux

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# set -e: exit asap if a command exits with a non-zero status
+# set -x: print each command right before it is executed
+set -xe
+
+# cleanup
+service docker stop || true
+rm -f /etc/apt/sources.list.d/docker.list
+apt-get -qqy purge lxc-docker || true
+apt-get -qqy purge docker-engine || true
+/etc/init.d/apparmor stop || true
+rm -rf /var/lib/docker /dev/mapper/docker* /usr/bin/docker /run/docker /etc/docker
+rm -rf /etc/apt/sources.list.d/docker* /etc/default/docker /etc/init.d/docker /etc/apparmor.d/cache/docker
+rm -rf /etc/apparmor.d/docker /etc/bash_completion.d/docker /var/log/upstart/docker*
+rm -rf /var/lib/apt/lists/*docker* /var/lib/dpkg/info/*docker* /dev/disk/by-id/*docker*
+rm -rf /var/cache/apt/archives/docker*
+
+# install
+CODE_NAME=$(lsb_release -sc) #e.g. trusty
+[ "${CODE_NAME}" == "" ] && CODE_NAME=trusty
+echo "deb https://apt.dockerproject.org/repo ubuntu-${CODE_NAME} main" >> /etc/apt/sources.list.d/docker.list
+# sed -i.bak '/docker/d' /etc/apt/sources.list.d/docker.list
+apt-get -qqy update
+apt-get -qqy install apt-transport-https ca-certificates
+apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+apt-cache policy docker-engine || true
+apt-get -qqy install linux-image-extra-$(uname -r)
+apt-get -qqy install apparmor
+/etc/init.d/apparmor start || true
+export DEBCONF_NONINTERACTIVE_SEEN=true
+apt-get -qqy install docker-engine
+service docker start || true
+
+docker --version