# HG changeset patch
# User aldrich@ssdt-ohio.org
# Date 1589986111 -3600
# Node ID 731a1492c8a0a32f863574051a8ba314fb562467
# Parent  c7173920ecaf5a96e0322b9ffea86f274266a4ba
testbench updates

diff -r c7173920ecaf -r 731a1492c8a0 testbench-grid/Dockerfile
--- a/testbench-grid/Dockerfile	Mon May 04 19:13:14 2020 +0100
+++ b/testbench-grid/Dockerfile	Wed May 20 15:48:31 2020 +0100
@@ -1,10 +1,10 @@
-FROM java:8-jre
+FROM openjdk:8
 
-MAINTAINER Dave Smith <smith@nwoca.org>
+MAINTAINER Catherine Aldrich <aldrich@ssdt-ohio.org>
 
 ENV TESTBENCHJAR=/testbench-standalone.jar
 
-ADD http://files.ssdt.io/vaadin-testbench-standalone-4.0.3.jar $TESTBENCHJAR
+ADD http://files.ssdt.io/vaadin-testbench-standalone-5.1.2.jar $TESTBENCHJAR
 
 EXPOSE 4444
 
diff -r c7173920ecaf -r 731a1492c8a0 testbench-node/Dockerfile
--- a/testbench-node/Dockerfile	Mon May 04 19:13:14 2020 +0100
+++ b/testbench-node/Dockerfile	Wed May 20 15:48:31 2020 +0100
@@ -1,6 +1,6 @@
-FROM java:8-jre
+FROM openjdk:8
 
-MAINTAINER Dave Smith <smith@nwoca.org>
+MAINTAINER Catherine Aldrich <aldrich@ssdt-ohio.org>
 
 ENV TESTBENCHJAR=/testbench-standalone.jar
 
@@ -8,13 +8,37 @@
 
 WORKDIR /phantom
 
+
+
 ADD http://files.ssdt.io/phantomjs-2.1.1-linux-x86_64.tar /phantom/phantomjs.tar
 
 RUN 	tar -xf phantomjs.tar \
 		&& 	mv $(find /phantom -name phantomjs) /bin \
 		&& rm -rf /phantom
+		
 
-ADD http://files.ssdt.io/vaadin-testbench-standalone-4.0.3.jar $TESTBENCHJAR
+RUN apt-get update -y
+
+WORKDIR /
+##Chrome
+ADD http://files.ssdt.io/google-chrome-stable_current_amd64.deb .
+
+RUN apt install -y ./google-chrome-stable_current_amd64.deb
+
+RUN rm -rf google-chrome-stable_current_amd64.deb
+
+##Chromium driver (apt-get did notwork)
+ADD http://files.ssdt.io/chromedriver_linux64.zip .
+RUN unzip chromedriver_linux64.zip -d /
+RUN mv -f /chromedriver /usr/local/bin/chromedriver
+RUN chmod 0755 /usr/local/bin/chromedriver
+
+RUN rm -f /chromedriver_linux64
+##for testing purposes check versions
+RUN google-chrome --version
+RUN chromedriver --version
+
+ADD http://files.ssdt.io/vaadin-testbench-standalone-5.1.2.jar $TESTBENCHJAR
 
 WORKDIR / 
 
diff -r c7173920ecaf -r 731a1492c8a0 testbench-node/chromedriver_linux64.zip
Binary file testbench-node/chromedriver_linux64.zip has changed
diff -r c7173920ecaf -r 731a1492c8a0 testbench-node/docker-entrypoint.sh
--- a/testbench-node/docker-entrypoint.sh	Mon May 04 19:13:14 2020 +0100
+++ b/testbench-node/docker-entrypoint.sh	Wed May 20 15:48:31 2020 +0100
@@ -4,7 +4,7 @@
 case "$1" in
 
    node)
-     java -jar testbench-standalone.jar -role node -hub http://$HUB_HOST:4444/grid/register -browser "browserName=phantomjs"
+     java -jar testbench-standalone.jar -role node -hub http://$HUB_HOST:4444/grid/register -browser "browserName=chrome"
    ;;
 
   *)
diff -r c7173920ecaf -r 731a1492c8a0 testbench-node/google-chrome-stable_current_amd64.deb
Binary file testbench-node/google-chrome-stable_current_amd64.deb has changed
diff -r c7173920ecaf -r 731a1492c8a0 testbench-node/vaadin-testbench-standalone-5.1.2.jar
Binary file testbench-node/vaadin-testbench-standalone-5.1.2.jar has changed