From 615c86e1f1515f16598b4ee6ead6e5eebe2e133a Mon Sep 17 00:00:00 2001 From: Nagesh Arkalgud Date: Sun, 25 Mar 2018 23:05:56 -0700 Subject: [PATCH 1/3] Always download latest stable Firefox by default --- NodeFirefox/Dockerfile.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NodeFirefox/Dockerfile.txt b/NodeFirefox/Dockerfile.txt index f4fb7da243..c7480d8fbe 100644 --- a/NodeFirefox/Dockerfile.txt +++ b/NodeFirefox/Dockerfile.txt @@ -3,8 +3,8 @@ USER root #========= # Firefox #========= -ARG FIREFOX_VERSION=59.0.1 -RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "nightly" ] || [ $FIREFOX_VERSION = "devedition" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-latest-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \ +ARG FIREFOX_VERSION=latest +RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "latest" ]; then echo "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US"; elif [ $FIREFOX_VERSION = "nightly" ] || [ $FIREFOX_VERSION = "devedition" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-latest-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \ && apt-get update -qqy \ && apt-get -qqy --no-install-recommends install firefox \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \ From 38155a0313b479e83f45dfc204cba9f57598d53e Mon Sep 17 00:00:00 2001 From: Nagesh Arkalgud Date: Tue, 27 Mar 2018 12:25:28 -0700 Subject: [PATCH 2/3] Simplified if/else logic for Firefox latest download --- NodeFirefox/Dockerfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NodeFirefox/Dockerfile.txt b/NodeFirefox/Dockerfile.txt index c7480d8fbe..c441e86ba0 100644 --- a/NodeFirefox/Dockerfile.txt +++ b/NodeFirefox/Dockerfile.txt @@ -4,7 +4,7 @@ USER root # Firefox #========= ARG FIREFOX_VERSION=latest -RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "latest" ]; then echo "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US"; elif [ $FIREFOX_VERSION = "nightly" ] || [ $FIREFOX_VERSION = "devedition" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-latest-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \ +RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "nightly-latest" ] || [ $FIREFOX_VERSION = "devedition-latest" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \ && apt-get update -qqy \ && apt-get -qqy --no-install-recommends install firefox \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \ From 32a84518355fcb2b0b62dfb40eb24d801ca8bb5f Mon Sep 17 00:00:00 2001 From: Nagesh Arkalgud Date: Tue, 27 Mar 2018 13:26:59 -0700 Subject: [PATCH 3/3] Fixed download logic that was causing build to error out --- NodeFirefox/Dockerfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NodeFirefox/Dockerfile.txt b/NodeFirefox/Dockerfile.txt index c441e86ba0..3ef15319cf 100644 --- a/NodeFirefox/Dockerfile.txt +++ b/NodeFirefox/Dockerfile.txt @@ -4,7 +4,7 @@ USER root # Firefox #========= ARG FIREFOX_VERSION=latest -RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "nightly-latest" ] || [ $FIREFOX_VERSION = "devedition-latest" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \ +RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "latest" ] || [ $FIREFOX_VERSION = "nightly-latest" ] || [ $FIREFOX_VERSION = "devedition-latest" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \ && apt-get update -qqy \ && apt-get -qqy --no-install-recommends install firefox \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \