Mercurial > public > ssdt-docker
changeset 344:731a1492c8a0
testbench updates
| author | aldrich@ssdt-ohio.org |
|---|---|
| date | Wed, 20 May 2020 15:48:31 +0100 |
| parents | c7173920ecaf |
| children | 4a455e3e8445 cf7052e640ad |
| files | testbench-grid/Dockerfile testbench-node/Dockerfile testbench-node/chromedriver_linux64.zip testbench-node/docker-entrypoint.sh testbench-node/google-chrome-stable_current_amd64.deb testbench-node/vaadin-testbench-standalone-5.1.2.jar |
| diffstat | 6 files changed, 31 insertions(+), 7 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 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
--- 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 /
--- 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" ;; *)