# HG changeset patch # User aldrich@ssdt-ohio.org # Date 1589979482 -3600 # Node ID b8373a99ad4dee9ef8260016e96461d7a2f3a69a # Parent 27ae05ebfc1ab535248465e89e072da143cc3011 testbench updates diff -r 27ae05ebfc1a -r b8373a99ad4d testbench-grid/Dockerfile --- a/testbench-grid/Dockerfile Mon May 04 19:13:14 2020 +0100 +++ b/testbench-grid/Dockerfile Wed May 20 13:58:02 2020 +0100 @@ -1,10 +1,10 @@ FROM java:8-jre -MAINTAINER Dave Smith +MAINTAINER Catherine Aldrich 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 27ae05ebfc1a -r b8373a99ad4d testbench-node/Dockerfile --- a/testbench-node/Dockerfile Mon May 04 19:13:14 2020 +0100 +++ b/testbench-node/Dockerfile Wed May 20 13:58:02 2020 +0100 @@ -1,6 +1,6 @@ FROM java:8-jre -MAINTAINER Dave Smith +MAINTAINER Catherine Aldrich ENV TESTBENCHJAR=/testbench-standalone.jar @@ -8,13 +8,27 @@ 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 + +RUN apt-get update - -ADD http://files.ssdt.io/vaadin-testbench-standalone-4.0.3.jar $TESTBENCHJAR +RUN mkdir /chromeinstall + +ADD google-chrome-stable_current_amd64.deb /chromeinstall/google-chrome-stable_current_amd64.deb + +RUN apt install -y /chromeinstall/google-chrome-stable_current_amd64.deb + + +RUN apt-get install -y chromium-chromedriver + + +ADD http://files.ssdt.io/vaadin-testbench-standalone-5.1.2.jar $TESTBENCHJAR WORKDIR / diff -r 27ae05ebfc1a -r b8373a99ad4d 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 13:58:02 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" ;; *)