Add support for Firefox 46.0.1 and 47.0.1

Make Firefox 47.0.1 the default version

Author: davehunt

NodeBase/entry_point.sh

@@ -25,6 +25,10 @@ if [ ! -z "$REMOTE_HOST" ]; then
   REMOTE_HOST_PARAM="-remoteHost $REMOTE_HOST"
 fi
 
+if [ ! -z "$FIREFOX_VERSION" ]; then
+  sudo ln -fs /opt/firefox/${FIREFOX_VERSION}/firefox /usr/bin/firefox
+fi
+
 if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi

NodeChromeDebug/entry_point.sh

@@ -25,6 +25,10 @@ if [ ! -z "$REMOTE_HOST" ]; then
   REMOTE_HOST_PARAM="-remoteHost $REMOTE_HOST"
 fi
 
+if [ ! -z "$FIREFOX_VERSION" ]; then
+  sudo ln -fs /opt/firefox/${FIREFOX_VERSION}/firefox /usr/bin/firefox
+fi
+
 if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi

NodeFirefox/Dockerfile

@@ -6,17 +6,19 @@ USER root
 #=========
 # Firefox
 #=========
-ENV FIREFOX_VERSION 45.0.2
 RUN apt-get update -qqy \
   && apt-get -qqy --no-install-recommends install firefox \
   && rm -rf /var/lib/apt/lists/* \
-  && wget --no-verbose -O /tmp/firefox.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2 \
-  && apt-get -y purge firefox \
-  && rm -rf /opt/firefox \
-  && tar -C /opt -xjf /tmp/firefox.tar.bz2 \
-  && rm /tmp/firefox.tar.bz2 \
-  && mv /opt/firefox /opt/firefox-$FIREFOX_VERSION \
-  && ln -fs /opt/firefox-$FIREFOX_VERSION/firefox /usr/bin/firefox
+  && apt-get -y purge firefox
+RUN wget --no-verbose -O /tmp/firefox-45.0.2.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/45.0.2/linux-x86_64/en-US/firefox-45.0.2.tar.bz2 \
+  && wget --no-verbose -O /tmp/firefox-46.0.1.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/46.0.1/linux-x86_64/en-US/firefox-46.0.1.tar.bz2 \
+  && wget --no-verbose -O /tmp/firefox-47.0.1.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/en-US/firefox-47.0.1.tar.bz2
+RUN mkdir -p /opt/firefox/45.0.2 && tar -C /opt/firefox/45.0.2 --strip-components 1 -xjf /tmp/firefox-45.0.2.tar.bz2 \
+  && mkdir -p /opt/firefox/46.0.1 && tar -C /opt/firefox/46.0.1 --strip-components 1 -xjf /tmp/firefox-46.0.1.tar.bz2 \
+  && mkdir -p /opt/firefox/47.0.1 && tar -C /opt/firefox/47.0.1 --strip-components 1 -xjf /tmp/firefox-47.0.1.tar.bz2 \
+  && rm /tmp/firefox-*.tar.bz2
+ENV FIREFOX_VERSION 47.0.1
+RUN ln -fs /opt/firefox/${FIREFOX_VERSION}/firefox /usr/bin/firefox
 
 #========================
 # Selenium Configuration

NodeFirefox/Dockerfile.txt

@@ -5,17 +5,19 @@ USER root
 #=========
 # Firefox
 #=========
-ENV FIREFOX_VERSION 45.0.2
 RUN apt-get update -qqy \
   && apt-get -qqy --no-install-recommends install firefox \
   && rm -rf /var/lib/apt/lists/* \
-  && wget --no-verbose -O /tmp/firefox.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2 \
-  && apt-get -y purge firefox \
-  && rm -rf /opt/firefox \
-  && tar -C /opt -xjf /tmp/firefox.tar.bz2 \
-  && rm /tmp/firefox.tar.bz2 \
-  && mv /opt/firefox /opt/firefox-$FIREFOX_VERSION \
-  && ln -fs /opt/firefox-$FIREFOX_VERSION/firefox /usr/bin/firefox
+  && apt-get -y purge firefox
+RUN wget --no-verbose -O /tmp/firefox-45.0.2.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/45.0.2/linux-x86_64/en-US/firefox-45.0.2.tar.bz2 \
+  && wget --no-verbose -O /tmp/firefox-46.0.1.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/46.0.1/linux-x86_64/en-US/firefox-46.0.1.tar.bz2 \
+  && wget --no-verbose -O /tmp/firefox-47.0.1.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/47.0.1/linux-x86_64/en-US/firefox-47.0.1.tar.bz2
+RUN mkdir -p /opt/firefox/45.0.2 && tar -C /opt/firefox/45.0.2 --strip-components 1 -xjf /tmp/firefox-45.0.2.tar.bz2 \
+  && mkdir -p /opt/firefox/46.0.1 && tar -C /opt/firefox/46.0.1 --strip-components 1 -xjf /tmp/firefox-46.0.1.tar.bz2 \
+  && mkdir -p /opt/firefox/47.0.1 && tar -C /opt/firefox/47.0.1 --strip-components 1 -xjf /tmp/firefox-47.0.1.tar.bz2 \
+  && rm /tmp/firefox-*.tar.bz2
+ENV FIREFOX_VERSION 47.0.1
+RUN ln -fs /opt/firefox/${FIREFOX_VERSION}/firefox /usr/bin/firefox
 
 #========================
 # Selenium Configuration

NodeFirefoxDebug/entry_point.sh

@@ -25,6 +25,10 @@ if [ ! -z "$REMOTE_HOST" ]; then
   REMOTE_HOST_PARAM="-remoteHost $REMOTE_HOST"
 fi
 
+if [ ! -z "$FIREFOX_VERSION" ]; then
+  sudo ln -fs /opt/firefox/${FIREFOX_VERSION}/firefox /usr/bin/firefox
+fi
+
 if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi

README.md

@@ -62,12 +62,13 @@ By default the latest stable versions will be used, however you can override
 these using the following environment variables:
 
 - `SELENIUM_VERSION` - version of the Selenium server
+- `FIREFOX_VERSION` - version of Firefox (only applies to Firefox images)
 
-For example, the following will start a standalone Firefox server using
-Selenium 2.53.0:
+For example, the following will start a standalone server using Selenium 2.53.0
+and Firefox 45.0.2:
 
 ```bash
-$ docker run -d -p 4444:4444 -e SELENIUM_VERSION=2.53.0 selenium/standalone-firefox:2.53.1
+$ docker run -d -p 4444:4444 -e SELENIUM_VERSION=2.53.0 -e FIREFOX_VERSION=45.0.2 selenium/standalone-firefox:2.53.1
 ```
 
 ### JAVA_OPTS Java Environment Options

Standalone/entry_point.sh

@@ -9,6 +9,10 @@ function shutdown {
   wait $NODE_PID
 }
 
+if [ ! -z "$FIREFOX_VERSION" ]; then
+  sudo ln -fs /opt/firefox/${FIREFOX_VERSION}/firefox /usr/bin/firefox
+fi
+
 if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi

StandaloneChrome/entry_point.sh

@@ -9,6 +9,10 @@ function shutdown {
   wait $NODE_PID
 }
 
+if [ ! -z "$FIREFOX_VERSION" ]; then
+  sudo ln -fs /opt/firefox/${FIREFOX_VERSION}/firefox /usr/bin/firefox
+fi
+
 if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi

StandaloneFirefox/entry_point.sh

@@ -9,6 +9,10 @@ function shutdown {
   wait $NODE_PID
 }
 
+if [ ! -z "$FIREFOX_VERSION" ]; then
+  sudo ln -fs /opt/firefox/${FIREFOX_VERSION}/firefox /usr/bin/firefox
+fi
+
 if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi