Mercurial > public > ssdt-docker
changeset 361:2e65334684d8
adding and updating testbench information
| author | aldrich@ssdt-ohio.org |
|---|---|
| date | Wed, 09 Sep 2020 16:52:33 +0100 |
| parents | dcaaef5a6a4f |
| children | 91d530304bbf |
| files | testbench-grid/Dockerfile testbench-grid/vaadin-testbench-standalone-5.2.0.jar testbench-node/Dockerfile testbench-node/chromedriver_linux64_85.zip testbench-node/chromedriver_linux64_86.zip testbench-node/phantomjs-2.1.1-linux-x86_64.tar testbench-node/vaadin-testbench-standalone-5.2.0.jar |
| diffstat | 7 files changed, 26 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/testbench-grid/Dockerfile Tue Jun 09 15:13:55 2020 +0100 +++ b/testbench-grid/Dockerfile Wed Sep 09 16:52:33 2020 +0100 @@ -1,10 +1,10 @@ FROM openjdk:8 -MAINTAINER Catherine Aldrich <aldrich@ssdt-ohio.org> +MAINTAINER Catherine Aldrich and Greg Shepherd <shepherd@ssdt-ohio.org> ENV TESTBENCHJAR=/testbench-standalone.jar -ADD http://files.ssdt.io/vaadin-testbench-standalone-5.1.2.jar $TESTBENCHJAR +ADD ./vaadin-testbench-standalone-5.2.0.jar $TESTBENCHJAR EXPOSE 4444
--- a/testbench-node/Dockerfile Tue Jun 09 15:13:55 2020 +0100 +++ b/testbench-node/Dockerfile Wed Sep 09 16:52:33 2020 +0100 @@ -1,50 +1,47 @@ FROM openjdk:8 -MAINTAINER Catherine Aldrich <aldrich@ssdt-ohio.org> +MAINTAINER Catherine Aldrich and Greg Shepherd <shepherd@ssdt-ohio.org> ENV TESTBENCHJAR=/testbench-standalone.jar +# Install PhantomJS RUN mkdir /phantom - 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 - +WORKDIR / 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 +# Install Chrome browser +ARG CHROME_84="84.0.4147.30" +ARG CHROME_85="85.0.4183.83-1" +ARG CHROME_86="86.0.4240.22-1" +RUN wget --no-verbose -O /tmp/chrome.deb http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_85}_amd64.deb \ + && apt install -y /tmp/chrome.deb \ + && rm /tmp/chrome.deb -##Chromium driver (apt-get did notwork) -ADD http://files.ssdt.io/chromedriver_linux64.zip . -RUN unzip chromedriver_linux64.zip -d / +## Install Chromium driver +ADD ./chromedriver_linux64_85.zip . +RUN unzip chromedriver_linux64_85.zip -d / RUN mv -f /chromedriver /usr/local/bin/chromedriver -RUN chmod 0755 /usr/local/bin/chromedriver +RUN chmod 0777 /usr/local/bin/chromedriver +RUN rm -rf ./chromedriver_linux64_85.zip -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 / +# Add TestBench jar +ADD ./vaadin-testbench-standalone-5.2.0.jar $TESTBENCHJAR COPY ./docker-entrypoint.sh / +RUN chmod a+x /docker-entrypoint.sh -RUN chmod a+x /docker-entrypoint.sh +RUN apt-get update -y + +RUN chmod 0777 /usr/bin/google-chrome + +RUN /usr/bin/google-chrome --version +RUN /usr/local/bin/chromedriver --version ENTRYPOINT [ "./docker-entrypoint.sh" ]