Mercurial > public > ssdt-docker
changeset 343:b8373a99ad4d production
testbench updates
| author | aldrich@ssdt-ohio.org |
|---|---|
| date | Wed, 20 May 2020 13:58:02 +0100 |
| parents | 27ae05ebfc1a |
| children | 4598330892d2 |
| files | testbench-grid/Dockerfile testbench-node/Dockerfile testbench-node/docker-entrypoint.sh |
| diffstat | 3 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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
--- 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 <smith@nwoca.org> +MAINTAINER Catherine Aldrich <aldrich@ssdt-ohio.org> 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 /
--- 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" ;; *)