Drop and ignore Dockerfile where it's generated.

Author: kayabendroth

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

@@ -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,14 +2,22 @@ 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/*