Merge pull request #270 from SeleniumHQ/maint/upgrade-everything

Upgrade stuff and remove generated files from repository.

Author: kayabendroth

Base/Dockerfile

@@ -27,7 +27,7 @@ RUN apt-get update -qqy \
 # Selenium
 #==========
 RUN  mkdir -p /opt/selenium \
-  && wget --no-verbose https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.0.jar -O /opt/selenium/selenium-server-standalone.jar
+  && wget --no-verbose https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar -O /opt/selenium/selenium-server-standalone.jar
 
 #========================================
 # Add normal user with passwordless sudo

Hub/.gitignore

@@ -0,0 +1,2 @@
+# The Dockerfile will be generated.
+Dockerfile

Hub/Dockerfile

@@ -17,6 +17,7 @@ ENV GRID_UNREGISTER_IF_STILL_DOWN_AFTER 30000
 
 COPY generate_config /opt/selenium/generate_config
 COPY entry_point.sh /opt/bin/entry_point.sh
+RUN /opt/selenium/generate_config > /opt/selenium/config.json
 RUN chown -R seluser /opt/selenium
 
 USER seluser

Hub/Dockerfile.txt

@@ -1,5 +1,5 @@
 NAME := selenium
-VERSION := $(or $(VERSION),$(VERSION),'2.53.0')
+VERSION := $(or $(VERSION),$(VERSION),'2.53.1')
 PLATFORM := $(shell uname -s)
 BUILD_ARGS := $(BUILD_ARGS)
 

Makefile

@@ -0,0 +1,2 @@
+# The Dockerfile will be generated.
+Dockerfile

NodeBase/.gitignore

@@ -0,0 +1,2 @@
+# The Dockerfile will be generated.
+Dockerfile

NodeBase/Dockerfile

@@ -2,21 +2,29 @@ MAINTAINER Selenium <[email protected]>
 
 USER root
 
-#===============
+#============================================
 # Google Chrome
-#===============
+#============================================
+# can specify versions by CHROME_VERSION;
+#  e.g. google-chrome-stable=53.0.2785.101-1
+#       google-chrome-beta=53.0.2785.92-1
+#       google-chrome-unstable=54.0.2840.14-1
+#       latest (equivalent to google-chrome-stable)
+#       google-chrome-beta  (pull latest beta)
+#============================================
+ENV CHROME_VERSION "google-chrome-stable"
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
   && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
   && apt-get update -qqy \
   && apt-get -qqy install \
-    google-chrome-stable \
+    ${CHROME_VERSION:-google-chrome-stable} \
   && rm /etc/apt/sources.list.d/google-chrome.list \
   && rm -rf /var/lib/apt/lists/*
 
 #==================
 # Chrome webdriver
 #==================
-ENV CHROME_DRIVER_VERSION 2.21
+ENV CHROME_DRIVER_VERSION 2.23
 RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
   && rm -rf /opt/selenium/chromedriver \
   && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \

NodeChrome/.gitignore

@@ -0,0 +1,2 @@
+# Dockerfile will be generated.
+Dockerfile

NodeChrome/Dockerfile

@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-FROM selenium/node-chrome-debug:2.53.0
+FROM selenium/node-chrome-debug:2.53.1
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```

NodeChrome/Dockerfile.txt

@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-FROM selenium/##BASE##-debug:2.53.0
+FROM selenium/##BASE##-debug:2.53.1
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```

NodeChromeDebug/.gitignore

@@ -4,10 +4,8 @@ BASE=$2
 BROWSER=$3
 VERSION=$4
 
-rm -rf $FOLDER
-mkdir -p $FOLDER
-
-echo FROM selenium/$BASE:$VERSION > $FOLDER/Dockerfile
+echo '# THIS FILE IS GENERATED: DO NOT EDIT!' > $FOLDER/Dockerfile
+echo FROM selenium/$BASE:$VERSION >> $FOLDER/Dockerfile
 cat ./Dockerfile.txt >> $FOLDER/Dockerfile
 
 cat ../NodeBase/entry_point.sh \

NodeChromeDebug/Dockerfile

@@ -0,0 +1,2 @@
+# The Dockerfile will be generated.
+Dockerfile

NodeChromeDebug/README.md

@@ -5,7 +5,7 @@ USER root
 #=========
 # Firefox
 #=========
-ENV FIREFOX_VERSION 45.0.2
+ENV FIREFOX_VERSION 47.0.1
 RUN apt-get update -qqy \
   && apt-get -qqy --no-install-recommends install firefox \
   && rm -rf /var/lib/apt/lists/* \

NodeDebug/README.template.md

@@ -0,0 +1,2 @@
+# Dockerfile will be generated.
+Dockerfile

NodeDebug/generate.sh

@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
 
 ``` dockerfile
-FROM selenium/node-firefox-debug:2.53.0
+FROM selenium/node-firefox-debug:2.53.1
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```