Mercurial > public > ssdt-docker

changeset 352:180476e1555b production v2.8.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
flow: Merged <release> '2.8.1' to <master> ('production').
author aldrich@ssdt-ohio.org
date Wed, 20 May 2020 15:58:47 +0100
parents 4598330892d2 (diff) 5ed8e2ba0d91 (current diff)
children 77395e33726a
files
diffstat 2 files changed, 14 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed May 20 15:58:46 2020 +0100
+++ b/.hgtags	Wed May 20 15:58:47 2020 +0100
@@ -15,3 +15,9 @@
 7441285bf3260df13dd32eef7368884852fce59a v2.0.1
 3754be907d9be60edd6e0afcb478485a5b4f4d27 vv2.1.0
 0032d099a2d5033819cbe463e59956317c3e36ca v2.2.0
+6b56c854199ccf1f6939ad2c211648d635fe732f v2.2.1
+d41836720ce4ded3d3bd099241d10cc4dd57a173 v2.3.0
+95d7d70f34a5cd36548c5b5e58e6137b731fe230 v2.4.0
+15d0cffd99801a905f5a6e63d1b1a86a5222cbd8 v2.5.0
+b35f4af06ed4a931b3418b9fe2adaa7dcb1672b5 vv2.6.0
+9735d4fef9c5c07c557b52b9572b773136b76e90 v2.7.0
--- a/testbench-node/Dockerfile	Wed May 20 15:58:46 2020 +0100
+++ b/testbench-node/Dockerfile	Wed May 20 15:58:47 2020 +0100
@@ -1,4 +1,4 @@
-FROM openjdk:8
+FROM java:8-jre
 
 MAINTAINER Catherine Aldrich <aldrich@ssdt-ohio.org>
 
@@ -16,27 +16,17 @@
 		&& 	mv $(find /phantom -name phantomjs) /bin \
 		&& rm -rf /phantom
 		
-
-RUN apt-get update -y
+RUN apt-get update -
 
-WORKDIR /
-##Chrome
-ADD http://files.ssdt.io/google-chrome-stable_current_amd64.deb .
+RUN mkdir /chromeinstall
 
-RUN apt install -y ./google-chrome-stable_current_amd64.deb
-
-RUN rm -rf google-chrome-stable_current_amd64.deb
+ADD google-chrome-stable_current_amd64.deb  /chromeinstall/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  apt install -y /chromeinstall/google-chrome-stable_current_amd64.deb
+
 
-RUN rm -f /chromedriver_linux64
-##for testing purposes check versions
-RUN google-chrome --version
-RUN chromedriver --version
+RUN apt-get install -y chromium-chromedriver 
+
 
 ADD http://files.ssdt.io/vaadin-testbench-standalone-5.1.2.jar $TESTBENCHJAR