Pick random ports from a range to avoid collisions

Author: elgalu

.travis.yml

@@ -48,7 +48,7 @@ matrix:
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.13.0-rc1"
+        - DOCKER_VERSION="1.13.0-rc2"
           DOCKER_COMPOSE_VERSION="1.9.0"
     # Linux with docker:stable compose:beta/older
     - os: linux
@@ -68,7 +68,7 @@ matrix:
       services:
         - docker
       env:
-        - DOCKER_VERSION="1.13.0-rc1"
+        - DOCKER_VERSION="1.13.0-rc2"
           DOCKER_COMPOSE_VERSION="1.9.0-rc4"
     # Mac OSX: only test native docker version
     - os: osx

CHANGELOG.md

@@ -7,6 +7,33 @@ 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
+ + Pick random ports from a range to avoid collisions
+ + Image tag details:
+  + Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
+  + Selenium 3: 3.0.1 (1969d75)
+  + Chrome stable:  TBD_CHROME_STABLE
+  + Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
+  + Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
+  + Geckodriver: TBD_GECKO_DRIVER
+  + 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-47-generic x86_64
+  + Tested on kernel CI  host: TBD_HOST_UNAME
+  + Built at dev host with: Docker version 1.12.3, build 6b644ec
+  + Built at CI  host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
+  + Built at dev host with: Docker Compose version 1.9.0, build 2585387
+  + 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
+
 ## 3.0.1g
  + Date: 2016-11-18
  + NoVNC new defaults: autoconnect=true, view_only=true, resize=scale

CONTRIBUTING.md

@@ -7,18 +7,18 @@ For pull requests or local commits:
     docker exec grid versions && ./test/after_script && travis lint
     open ./images/grid2_console.png && open ./images/grid3_console.png && open ./videos/mobile_emulation/*.mkv
     open test/seleIDE/videos/rc/sele_ide.mkv
-    git checkout -b tmp-3.0.1g && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
+    git checkout -b tmp-3.0.1h && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
     #git add ... git commit ... git push ... open pull request
 
 For repository owners only:
 
-    git commit -m "NoVNC new defaults: autoconnect=true, view_only=true, resize=scale"
-    git tag -d latest && git tag 3.0.1g && git push origin tmp-3.0.1g && git push --tags
+    git commit -m "Pick random ports from a range to avoid collisions"
+    git tag -d latest && git tag 3.0.1h && git push origin tmp-3.0.1h && 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-3.0.1g && git push origin --delete tmp-3.0.1g
+    git checkout master && git pull && git branch -d tmp-3.0.1h && git push origin --delete tmp-3.0.1h
 
 -- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
 -- If Chrome version changed upload:
@@ -35,9 +35,9 @@ Keep certain bins if chrome version changed for example:
 ## Retry
 Failed in Travis? retry
 
-    git tag -d 3.0.1g && git push origin :3.0.1g
+    git tag -d 3.0.1h && git push origin :3.0.1h
     #git add ...
-    git commit --amend && git tag 3.0.1g && git push --force origin tmp-3.0.1g && git push --tags
+    git commit --amend && git tag 3.0.1h && git push --force origin tmp-3.0.1h && 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

@@ -662,16 +662,20 @@ ENV DEFAULT_SELENIUM_HUB_PORT="24444" \
     DEFAULT_VNC_PORT="25900" \
     DEFAULT_NOVNC_PORT="26080" \
     DEFAULT_SAUCE_LOCAL_SEL_PORT="4445" \
-    DEFAULT_SUPERVISOR_HTTP_PORT="29001"
+    DEFAULT_SUPERVISOR_HTTP_PORT="19001"
 
 # Commented for now; all these versions are still available at
 #   https://github.com/elgalu/docker-selenium/releases/tag/2.47.1m
 # USE_SELENIUM "2" / "3"
 #   Selenium 2 or 3
 # CHROME_FLAVOR "stable"
-#   Default chrome flavor, options no longer avariable: beta|unstable
+#   Default chrome flavor, options no longer available: beta|unstable
 # PICK_ALL_RANDMON_PORTS "true" / "false"
 #   Randomize all ports, i.e. pick unused unprivileged ones
+# RANDOM_PORT_FROM
+# RANDOM_PORT_TO
+#   When using PICK_ALL_RANDMON_PORTS=true the ports will
+#   be from a range to avoid collisions
 # MEM_JAVA_PERCENT "80"
 #   Because the JVM uses only 1/4 of system memory by default
 # WAIT_FOREGROUND_RETRY
@@ -782,11 +786,13 @@ ENV DEFAULT_SELENIUM_HUB_PORT="24444" \
 # DOCKER_SOCK
 #   Run docker from inside docker
 #   Usage: docker run -v /var/run/docker.sock:/var/run/docker.sock
-#                     -v $(which docker):$(which docker)
+#                     -v $(which docker):/usr/bin/docker
 ENV FIREFOX_VERSION="${FF_VER}" \
   USE_SELENIUM="2" \
   CHROME_FLAVOR="stable" \
   PICK_ALL_RANDMON_PORTS="false" \
+  RANDOM_PORT_FROM="23100" \
+  RANDOM_PORT_TO="29999" \
   USER="seluser" \
   HOME="/home/seluser" \
   VNC_STORE_PWD_FILE="/home/seluser/.vnc/passwd" \

bin/entry.sh

@@ -128,47 +128,47 @@ fi
 
 # TODO: Remove this duplicated logic
 if [ "${SELENIUM_HUB_PORT}" = "0" ]; then
-  export SELENIUM_HUB_PORT=$(get_unused_port)
+  export SELENIUM_HUB_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
 elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
   # User want to pick random ports but may also want to fix some others
   if [ "${SELENIUM_HUB_PORT}" = "${DEFAULT_SELENIUM_HUB_PORT}" ]; then
-    export SELENIUM_HUB_PORT=$(get_unused_port)
+    export SELENIUM_HUB_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
   fi
 fi
 
 if [ "${SELENIUM_NODE_CH_PORT}" = "0" ]; then
-  export SELENIUM_NODE_CH_PORT=$(get_unused_port)
+  export SELENIUM_NODE_CH_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
 elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
   # User want to pick random ports but may also want to fix some others
   if [ "${SELENIUM_NODE_CH_PORT}" = "${DEFAULT_SELENIUM_NODE_CH_PORT}" ]; then
-    export SELENIUM_NODE_CH_PORT=$(get_unused_port)
+    export SELENIUM_NODE_CH_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
   fi
 fi
 
 if [ "${SELENIUM_NODE_FF_PORT}" = "0" ]; then
-  export SELENIUM_NODE_FF_PORT=$(get_unused_port)
+  export SELENIUM_NODE_FF_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
 elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
   # User want to pick random ports but may also want to fix some others
   if [ "${SELENIUM_NODE_FF_PORT}" = "${DEFAULT_SELENIUM_NODE_FF_PORT}" ]; then
-    export SELENIUM_NODE_FF_PORT=$(get_unused_port)
+    export SELENIUM_NODE_FF_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
   fi
 fi
 
 if [ "${SELENIUM_NODE_RC_CH_PORT}" = "0" ]; then
-  export SELENIUM_NODE_RC_CH_PORT=$(get_unused_port)
+  export SELENIUM_NODE_RC_CH_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
 elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
   # User want to pick random ports but may also want to fix some others
   if [ "${SELENIUM_NODE_RC_CH_PORT}" = "${DEFAULT_SELENIUM_NODE_RC_CH_PORT}" ]; then
-    export SELENIUM_NODE_RC_CH_PORT=$(get_unused_port)
+    export SELENIUM_NODE_RC_CH_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
   fi
 fi
 
 if [ "${SELENIUM_NODE_RC_FF_PORT}" = "0" ]; then
-  export SELENIUM_NODE_RC_FF_PORT=$(get_unused_port)
+  export SELENIUM_NODE_RC_FF_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
 elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
   # User want to pick random ports but may also want to fix some others
   if [ "${SELENIUM_NODE_RC_FF_PORT}" = "${DEFAULT_SELENIUM_NODE_RC_FF_PORT}" ]; then
-    export SELENIUM_NODE_RC_FF_PORT=$(get_unused_port)
+    export SELENIUM_NODE_RC_FF_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
   fi
 fi
 
@@ -199,11 +199,11 @@ if [ "${VNC_START}" = "true" ]; then
     export VNC_PORT=$(get_unused_port_from_range ${VNC_FROM_PORT} ${VNC_TO_PORT})
   else
     if [ "${VNC_PORT}" = "0" ]; then
-      export VNC_PORT=$(get_unused_port)
+      export VNC_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
     elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
       # User want to pick random ports but may also want to fix some others
       if [ "${VNC_PORT}" = "${DEFAULT_VNC_PORT}" ]; then
-        export VNC_PORT=$(get_unused_port)
+        export VNC_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
       fi
     fi
   fi
@@ -213,29 +213,29 @@ fi
 
 
 if [ "${NOVNC_PORT}" = "0" ]; then
-  export NOVNC_PORT=$(get_unused_port)
+  export NOVNC_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
 elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
   # User want to pick random ports but may also want to fix some others
   if [ "${NOVNC_PORT}" = "${DEFAULT_NOVNC_PORT}" ]; then
-    export NOVNC_PORT=$(get_unused_port)
+    export NOVNC_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
   fi
 fi
 
 if [ "${SAUCE_LOCAL_SEL_PORT}" = "0" ]; then
-  export SAUCE_LOCAL_SEL_PORT=$(get_unused_port)
+  export SAUCE_LOCAL_SEL_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
 elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
   # User want to pick random ports but may also want to fix some others
   if [ "${SAUCE_LOCAL_SEL_PORT}" = "${DEFAULT_SAUCE_LOCAL_SEL_PORT}" ]; then
-    export SAUCE_LOCAL_SEL_PORT=$(get_unused_port)
+    export SAUCE_LOCAL_SEL_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
   fi
 fi
 
 if [ "${SUPERVISOR_HTTP_PORT}" = "0" ]; then
-  export SUPERVISOR_HTTP_PORT=$(get_unused_port)
+  export SUPERVISOR_HTTP_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
 elif [ "${PICK_ALL_RANDMON_PORTS}" = "true" ]; then
   # User want to pick random ports but may also want to fix some others
   if [ "${SUPERVISOR_HTTP_PORT}" = "${DEFAULT_SUPERVISOR_HTTP_PORT}" ]; then
-    export SUPERVISOR_HTTP_PORT=$(get_unused_port)
+    export SUPERVISOR_HTTP_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
   fi
 fi