Merge pull request SeleniumHQ#93 from SeleniumHQ/kayabendroth-feature/upgrade-to-java-8

Kayabendroth feature/upgrade to java 8

Author: rubytester

.gitignore

@@ -4,4 +4,6 @@ node_modules/
 .idea/
 # Sed backup files.
 *-e
+# Vim swap files.
+*.swp
 

Base/Dockerfile

@@ -1,11 +1,11 @@
-FROM ubuntu:14.04
+FROM ubuntu:15.04
 MAINTAINER Selenium <[email protected]>
 
 #================================================
 # Customize sources for apt-get
 #================================================
-RUN  echo "deb http://archive.ubuntu.com/ubuntu trusty main universe\n" > /etc/apt/sources.list \
-  && echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe\n" >> /etc/apt/sources.list
+RUN  echo "deb http://archive.ubuntu.com/ubuntu vivid main universe\n" > /etc/apt/sources.list \
+  && echo "deb http://archive.ubuntu.com/ubuntu vivid-updates main universe\n" >> /etc/apt/sources.list
 
 #========================
 # Miscellaneous packages
@@ -14,11 +14,12 @@ RUN  echo "deb http://archive.ubuntu.com/ubuntu trusty main universe\n" > /etc/a
 RUN apt-get update -qqy \
   && apt-get -qqy --no-install-recommends install \
     ca-certificates \
-    openjdk-7-jre-headless \
+    openjdk-8-jre-headless \
+    sudo \
     unzip \
     wget \
   && rm -rf /var/lib/apt/lists/* \
-  && sed -i 's/\/dev\/urandom/\/dev\/.\/urandom/' ./usr/lib/jvm/java-7-openjdk-amd64/jre/lib/security/java.security
+  && sed -i 's/\/dev\/urandom/\/dev\/.\/urandom/' ./usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security
 
 #==========
 # Selenium

NodeChrome/Dockerfile

@@ -17,7 +17,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
 #==================
 # Chrome webdriver
 #==================
-ENV CHROME_DRIVER_VERSION 2.16
+ENV CHROME_DRIVER_VERSION 2.18
 RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip http://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
   && rm -rf /opt/selenium/chromedriver \
   && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \

NodeChrome/Dockerfile.txt

@@ -16,7 +16,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
 #==================
 # Chrome webdriver
 #==================
-ENV CHROME_DRIVER_VERSION 2.16
+ENV CHROME_DRIVER_VERSION 2.18
 RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip http://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
   && rm -rf /opt/selenium/chromedriver \
   && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \

README.md

@@ -21,6 +21,15 @@ Images included:
 - __selenium/node-firefox-debug__: Selenium node with Firefox installed and runs a VNC server, needs to be connected to a Selenium Grid Hub
 
 ## Running the images
+ 
+When executing docker run for an image with chrome browser please add volume mount `-v /dev/shm:/dev/shm` to use the host's shared memory.
+
+``` bash
+$ docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:2.47.1
+```
+
+This is a workaround to node-chrome crash in docker container issue: https://code.google.com/p/chromium/issues/detail?id=519952 
+
 
 ### Standalone Chrome and Firefox
 
@@ -57,10 +66,10 @@ $ docker run -d -p 4444:4444 -e JAVA_OPTS=-Xmx512m --name selenium-hub selenium/
 
 ## Building the images
 
-Ensure you have the `ubuntu:14.04` base image downloaded, this step is _optional_ since Docker takes care of downloading the parent base image automatically.
+Ensure you have the `ubuntu:15.04` base image downloaded, this step is _optional_ since Docker takes care of downloading the parent base image automatically.
 
 ``` bash
-$ docker pull ubuntu:14.04
+$ docker pull ubuntu:15.04
 ```
 
 Clone the repo and from the project directory root you can build everything by running:
@@ -140,12 +149,12 @@ RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 $ docker images
 #=>
 REPOSITORY                      TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
-selenium/node-firefox           2.45.0              c7c0c99afabd        31 minutes ago      695.9 MB
-selenium/node-chrome            2.45.0              c4cd17423321        31 minutes ago      796.7 MB
-selenium/node-base              2.45.0              4f7c1788fe4c        32 minutes ago      584.8 MB
-selenium/hub                    2.45.0              427462f54676        35 minutes ago      431.4 MB
-selenium/base                   2.45.0              9126579ae96e        35 minutes ago      431.4 MB
-ubuntu                          14.04               5506de2b643b        3 weeks ago         199.3 MB
+selenium/node-firefox           2.47.1              69f762d0d79e        29 minutes ago      552.1 MB
+selenium/node-chrome            2.47.1              9dd73160660b        30 minutes ago      723.6 MB
+selenium/node-base              2.47.1              1b7a0b7024b1        32 minutes ago      426.1 MB
+selenium/hub                    2.47.1              2570bbb98229        33 minutes ago      394.4 MB
+selenium/base                   2.47.1              33478d455dab        33 minutes ago      362.6 MB
+ubuntu                          15.04               013f3d01d247        6 days ago          131.4 MB
 ```
 
 ### Troubleshooting

Test/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:0.10-onbuild
+FROM node:0.12.7-onbuild
 MAINTAINER Selenium <[email protected]>
 
 ENV TEST_CMD ""

Test/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache 2",
   "dependencies": {
-    "chai": "^1.10.0",
-    "colors": "^1.0.3",
-    "wd": "^0.3.11"
+    "chai": "^3.2.0",
+    "colors": "^1.1.2",
+    "wd": "^0.3.12"
   }
 }

Test/smoke-test.js

@@ -25,17 +25,17 @@ module.exports = function(browserName) {
   browser.init({
     browserName: browserName
   }, function() {
-    browser.get("https://github.com", function() {
+    browser.get("https://www.wikipedia.org/", function() {
       browser.title(function(err, title) {
         if (err) {
           console.error(err);
           browser.quit();
           process.exit(1);
         }
 
-        title.should.include('GitHub');
+        title.should.include('Wikipedia');
         browser.quit();
-      });
+      })
     });
   });
 };

test.sh

@@ -8,18 +8,21 @@ fi
 echo Building test container image
 docker build -t selenium/test:local ./Test
 
-echo Starting Selenium Container
+echo 'Starting Selenium Hub Container...'
 HUB=$(docker run -d selenium/hub:2.47.1)
 HUB_NAME=$(docker inspect -f '{{ .Name  }}' $HUB | sed s:/::)
-sleep 2
+echo 'Waiting for Hub to come online...'
+docker logs -f $HUB &
+sleep 4
 
+echo 'Starting Selenium Chrome node...'
 NODE_CHROME=$(docker run -d --link $HUB_NAME:hub  selenium/node-chrome$DEBUG:2.47.1)
+echo 'Starting Selenium Firefox node...'
 NODE_FIREFOX=$(docker run -d --link $HUB_NAME:hub selenium/node-firefox$DEBUG:2.47.1)
-
-docker logs -f $HUB &
 docker logs -f $NODE_CHROME &
 docker logs -f $NODE_FIREFOX &
-sleep 2
+echo 'Waiting for nodes to register and come online...'
+sleep 10
 
 function test_node {
   BROWSER=$1