Merge pull request #258 from ruescar/firefox-esr

firefox-esr support wrap-up

README.md

@@ -79,20 +79,21 @@ $ ./automate_android.sh
 ```
 This command is interactive - just answer the questions and it will build an image for you. In order to bundle custom APK to image - put it to `selenium/android` directory before running the script.
 
-## How to build images for Beta and Dev channels
+## How to build images for non-default channels
 
-Apart from the default Stable release channel, the following ones are also supported:
+Apart from the default stable release channel, the following ones are also supported:
 
 | Browser | Channel | Package |
 | :--- | :--- | :--- |
-| Firefox | Beta | firefox [(PPA)](https://launchpad.net/~mozillateam/+archive/ubuntu/firefox-next/+packages) |
-| Firefox | Dev | firefox-trunk [(PPA)](https://launchpad.net/~ubuntu-mozilla-daily/+archive/ubuntu/ppa/+packages) |
-| Chrome | Beta | google-chrome-beta |
-| Chrome | Dev | google-chrome-unstable |
-| Opera | Beta | opera-beta | |
-| Opera | Dev | opera-developer | |
-
-* To build an image for one of the channels above use the optional argument `{beta|dev}` at the end of the corresponding command.
+| firefox | beta | firefox [(PPA)](http://launchpad.net/~mozillateam/+archive/firefox-next/+packages) |
+| firefox | dev | firefox-trunk [(PPA)](http://launchpad.net/~ubuntu-mozilla-daily/+archive/ppa/+packages) |
+| firefox | esr | firefox-esr [(PPA)](http://launchpad.net/~mozillateam/+archive/ppa/+packages) |
+| chrome | beta | google-chrome-beta |
+| chrome | dev | google-chrome-unstable |
+| opera | beta | opera-beta | |
+| opera | dev | opera-developer | |
+
+* To build an image for one of the channels above use the optional argument `{beta|dev|esr}` at the end of the corresponding command.
 ```
 $ ./automate_firefox.sh 72.0~a1~hg20191114r501767-0ubuntu0.18.04.1~umd1 1.9.3 72.0a1 0.26.0 dev
 ```

selenium/build-dev.sh

@@ -2,7 +2,7 @@
 set -e
 
 if [ -z "$1" -o -z "$2" -o -z "$3" ]; then
-    echo 'Usage: build-dev.sh {firefox/apt|firefox/local|chrome/apt|chrome/local|opera/presto|opera/blink/local|opera/blink/apt|yandex/local|yandex/apt} <browser_version> {default|beta|dev} [<cleanup={true|false}>] [<requires_java={true|false}>]'
+    echo 'Usage: build-dev.sh {firefox/apt|firefox/local|chrome/apt|chrome/local|opera/presto|opera/blink/local|opera/blink/apt|yandex/local|yandex/apt} <browser_version> {default|beta|dev|esr} [<cleanup={true|false}>] [<requires_java={true|false}>]'
     exit 1
 fi
 set -x
@@ -61,8 +61,9 @@ if [ "$channel" != "default" ]; then
                 dev)
                     additional_docker_args+=" --build-arg PACKAGE=firefox-trunk --build-arg PPA=ppa:ubuntu-mozilla-daily/ppa"
                     ;;
-		esr)
-		    additional_docker_args+=" --build-arg PACKAGE=firefox-esr --build-arg PPA=ppa:mozillateam/ppa"
+                esr)
+                    additional_docker_args+=" --build-arg PACKAGE=firefox-esr --build-arg PPA=ppa:mozillateam/ppa"
+                    ;;
             esac
             ;;
         chrome)

selenium/firefox/local/Dockerfile.tmpl

@@ -24,15 +24,15 @@ RUN \
                 apt-get -y install libc6:i386 libncurses5:i386 libstdc++6:i386 libgtk-3-0:i386 libasound2:i386 libdbus-glib-1-2:i386 libxt6:i386 libatomic1:i386 libcairo-gobject2:i386 libstartup-notification0:i386 libx11-xcb1:i386 && \
                 mkdir flashplayer && \
                 cd flashplayer && \
-                wget -O flashplayer.tar.gz https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.330/flash_player_ppapi_linux.i386.tar.gz && \
+                wget -O flashplayer.tar.gz https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.387/flash_player_ppapi_linux.i386.tar.gz && \
                 tar xvzf flashplayer.tar.gz && \
                 cp libpepflashplayer.so /usr/lib/flashplugin-installer/libflashplayer.so && \
                 cd .. && \
                 rm -Rf flashplayer \
             ) \
         ) && \
         dpkg -i firefox.deb && \
-        ( [ "$PACKAGE" = "firefox-trunk" ] && ln /usr/bin/$PACKAGE /usr/bin/firefox ) || true && \
+        ( [ "$PACKAGE" != "firefox" ] && ln /usr/bin/$PACKAGE /usr/bin/firefox ) || true && \
         rm firefox.deb && \
         firefox --version && \
         ($CLEANUP && rm -Rf /tmp/* && rm -Rf /var/lib/apt/lists/* && rm -f firefox*.deb) || true