From 5ae9464b347f622c713b67c2134c29ea292c3d94 Mon Sep 17 00:00:00 2001
From: Shawn Mccarthy <smccarthy@godaddy.com>
Date: Tue, 25 Apr 2017 14:03:01 -0700
Subject: [PATCH 1/6] Add NodeFirefoxNightly image

---
 Makefile                            | 23 ++++++++++-
 NodeFirefoxNightly/.gitignore       |  2 +
 NodeFirefoxNightly/Dockerfile.txt   | 62 +++++++++++++++++++++++++++++
 NodeFirefoxNightly/README-short.txt |  1 +
 NodeFirefoxNightly/README.md        | 54 +++++++++++++++++++++++++
 NodeFirefoxNightly/generate.sh      |  9 +++++
 NodeFirefoxNightly/generate_config  | 24 +++++++++++
 7 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 NodeFirefoxNightly/.gitignore
 create mode 100644 NodeFirefoxNightly/Dockerfile.txt
 create mode 100644 NodeFirefoxNightly/README-short.txt
 create mode 100644 NodeFirefoxNightly/README.md
 create mode 100755 NodeFirefoxNightly/generate.sh
 create mode 100644 NodeFirefoxNightly/generate_config

diff --git a/Makefile b/Makefile
index 3e11f82593..a11a54ee38 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,17 @@ BUILD_ARGS := $(BUILD_ARGS)
 MAJOR := $(word 1,$(subst ., ,$(VERSION)))
 MINOR := $(word 2,$(subst ., ,$(VERSION)))
 MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(VERSION)))
+NIGHTLY_VERSION := $(shell date +%m%d%Y>&1)
+LATEST_GECKODRIVER_URL := $(shell curl -s https://api.github.com/repos/mozilla/geckodriver/releases | grep browser_download_url | grep 'linux64.tar.gz' | head -n 1 | cut -d '"' -f 4 >&1)
 
-all: hub chrome firefox phantomjs chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
+all: hub chrome firefox firefox_nightly phantomjs chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
 
 generate_all:	\
 	generate_hub \
 	generate_nodebase \
 	generate_chrome \
 	generate_firefox \
+	generate_firefox_nightly \
 	generate_phantomjs \
 	generate_chrome_debug \
 	generate_firefox_debug \
@@ -52,6 +55,12 @@ generate_firefox:
 firefox: nodebase generate_firefox
 	cd ./NodeFirefox && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox:$(VERSION) .
 
+generate_firefox_nightly:
+	cd ./NodeFirefoxNightly && ./generate.sh $(VERSION)
+
+firefox_nightly: nodebase generate_firefox_nightly
+	cd ./NodeFirefoxNightly && docker build $(BUILD_ARGS) --build-arg GECKODRIVER_URL=$(LATEST_GECKODRIVER_URL) -t $(NAME)/node-firefox-nightly:$(NIGHTLY_VERSION) .
+
 generate_standalone_firefox:
 	cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION)
 
@@ -100,6 +109,7 @@ tag_latest:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:latest
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:latest
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:latest
+	docker tag $(NAME)/node-firefox-nightly:$(VERSION) $(NAME)/node-firefox-nightly:latest
 	docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:latest
 	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:latest
 	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:latest
@@ -114,6 +124,7 @@ release_latest:
 	docker push $(NAME)/node-base:latest
 	docker push $(NAME)/node-chrome:latest
 	docker push $(NAME)/node-firefox:latest
+	docker push $(NAME)/node-firefox-nightly:latest
 	docker push $(NAME)/node-phantomjs:latest
 	docker push $(NAME)/node-chrome-debug:latest
 	docker push $(NAME)/node-firefox-debug:latest
@@ -128,6 +139,7 @@ tag_major_minor:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR)
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR)
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR)
+#	docker tag $(NAME)/node-firefox-nightly:$(VERSION) $(NAME)/node-firefox-nightly:$(MAJOR)
 	docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:$(MAJOR)
 	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR)
 	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR)
@@ -140,6 +152,7 @@ tag_major_minor:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR).$(MINOR)
+#	docker tag $(NAME)/node-firefox-nightly:$(VERSION) $(NAME)/node-firefox-nightly:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
@@ -152,6 +165,7 @@ tag_major_minor:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
+#	docker tag $(NAME)/node-firefox-nightly:$(VERSION) $(NAME)/node-firefox-nightly:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR_MINOR_PATCH)
@@ -166,6 +180,7 @@ release: tag_major_minor
 	@if ! docker images $(NAME)/node-base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-chrome | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-chrome version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-firefox | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-firefox version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	@if ! docker images $(NAME)/node-firefox-nightly | awk '{ print $$2 }' | grep -q -F $(NIGHTLY_VERSION); then echo "$(NAME)/node-firefox-nightly version $(NIGHTLY_VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-phantomjs | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-phantomjs version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-chrome-debug | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-chrome-debug version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-firefox-debug | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-firefox-debug version $(VERSION) is not yet built. Please run 'make build'"; false; fi
@@ -178,6 +193,7 @@ release: tag_major_minor
 	docker push $(NAME)/node-base:$(VERSION)
 	docker push $(NAME)/node-chrome:$(VERSION)
 	docker push $(NAME)/node-firefox:$(VERSION)
+	docker push $(NAME)/node-firefox-nightly:$(NIGHTLY_VERSION)
 	docker push $(NAME)/node-phantomjs:$(VERSION)
 	docker push $(NAME)/node-chrome-debug:$(VERSION)
 	docker push $(NAME)/node-firefox-debug:$(VERSION)
@@ -191,6 +207,7 @@ release: tag_major_minor
 	docker push $(NAME)/node-base:$(MAJOR)
 	docker push $(NAME)/node-chrome:$(MAJOR)
 	docker push $(NAME)/node-firefox:$(MAJOR)
+#	docker push $(NAME)/node-firefox-nightly:$(MAJOR)
 	docker push $(NAME)/node-phantomjs:$(MAJOR)
 	docker push $(NAME)/node-chrome-debug:$(MAJOR)
 	docker push $(NAME)/node-firefox-debug:$(MAJOR)
@@ -204,6 +221,7 @@ release: tag_major_minor
 	docker push $(NAME)/node-base:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-chrome:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-firefox:$(MAJOR).$(MINOR)
+#	docker push $(NAME)/node-firefox-nightly:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-phantomjs:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
@@ -217,6 +235,7 @@ release: tag_major_minor
 	docker push $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
+#	docker push $(NAME)/node-firefox-nightly:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-phantomjs:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-chrome-debug:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-firefox-debug:$(MAJOR_MINOR_PATCH)
@@ -241,12 +260,14 @@ test:
 	ci \
 	firefox \
 	firefox_debug \
+	firefox_nightly \
 	phantomjs \
 	generate_all \
 	generate_hub \
 	generate_nodebase \
 	generate_chrome \
 	generate_firefox \
+	generate_firefox_nightly \
 	generate_phantomjs \
 	generate_chrome_debug \
 	generate_firefox_debug \
diff --git a/NodeFirefoxNightly/.gitignore b/NodeFirefoxNightly/.gitignore
new file mode 100644
index 0000000000..205411cbea
--- /dev/null
+++ b/NodeFirefoxNightly/.gitignore
@@ -0,0 +1,2 @@
+# The Dockerfile will be generated.
+Dockerfile
diff --git a/NodeFirefoxNightly/Dockerfile.txt b/NodeFirefoxNightly/Dockerfile.txt
new file mode 100644
index 0000000000..d58e66aa02
--- /dev/null
+++ b/NodeFirefoxNightly/Dockerfile.txt
@@ -0,0 +1,62 @@
+MAINTAINER Selenium <selenium-developers@googlegroups.com>
+
+USER root
+
+#=========
+# Firefox
+#=========
+ARG FIREFOX_VERSION=nightly
+RUN apt-get update -qqy \
+  && apt-get -qqy --no-install-recommends install firefox \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
+  && wget --no-verbose -O /tmp/firefox.tar.bz2 "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=linux64&lang=en-US" \
+  && 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
+
+#============
+# GeckoDriver
+#============
+ARG GECKODRIVER_VERSION=latest
+ARG GECKODRIVER_URL
+
+RUN wget --no-verbose -O /tmp/geckodriver.tar.gz $GECKODRIVER_URL \
+  && rm -rf /opt/geckodriver \
+  && tar -C /opt -zxf /tmp/geckodriver.tar.gz \
+  && rm /tmp/geckodriver.tar.gz \
+  && mv /opt/geckodriver /opt/geckodriver-$GECKODRIVER_VERSION \
+  && chmod 755 /opt/geckodriver-$GECKODRIVER_VERSION \
+  && ln -fs /opt/geckodriver-$GECKODRIVER_VERSION /usr/bin/geckodriver
+
+#========================
+# Selenium Configuration
+#========================
+# As integer, maps to "maxInstances"
+ENV NODE_MAX_INSTANCES 1
+# As integer, maps to "maxSession"
+ENV NODE_MAX_SESSION 1
+# As integer, maps to "port"
+ENV NODE_PORT 5555
+# In milliseconds, maps to "registerCycle"
+ENV NODE_REGISTER_CYCLE 5000
+# In milliseconds, maps to "nodePolling"
+ENV NODE_POLLING 5000
+# In milliseconds, maps to "unregisterIfStillDownAfter"
+ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
+# As integer, maps to "downPollingLimit"
+ENV NODE_DOWN_POLLING_LIMIT 2
+# As string, maps to "applicationName"
+ENV NODE_APPLICATION_NAME ""
+
+COPY generate_config /opt/selenium/generate_config
+RUN chmod +x /opt/selenium/generate_config \
+  && chown -R seluser:seluser /opt/selenium
+
+# Following line fixes
+# https://github.com/SeleniumHQ/docker-selenium/issues/87
+RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
+
+USER seluser
diff --git a/NodeFirefoxNightly/README-short.txt b/NodeFirefoxNightly/README-short.txt
new file mode 100644
index 0000000000..992d5c0004
--- /dev/null
+++ b/NodeFirefoxNightly/README-short.txt
@@ -0,0 +1 @@
+Selenium Node configured to run Firefox
diff --git a/NodeFirefoxNightly/README.md b/NodeFirefoxNightly/README.md
new file mode 100644
index 0000000000..b03730638c
--- /dev/null
+++ b/NodeFirefoxNightly/README.md
@@ -0,0 +1,54 @@
+# Selenium Grid Node - Firefox
+
+Selenium Node configured to run Firefox
+
+## Dockerfile
+
+[`selenium/node-firefox` Dockerfile](https://github.com/SeleniumHQ/docker-selenium/blob/master/NodeFirefox/Dockerfile)
+
+## How to use this image
+
+First, you will need a Selenium Grid Hub that the Node will connect to.
+
+```
+$ docker run -d -P --name selenium-hub selenium/hub
+```
+
+Once the hub is up and running will want to launch nodes that can run tests. You can run as many nodes as you wish.
+
+```
+$ docker run -d --link selenium-hub:hub selenium/node-firefox
+```
+
+## What is Selenium?
+_Selenium automates browsers._ That's it! What you do with that power is entirely up to you. Primarily, it is for automating web applications for testing purposes, but is certainly not limited to just that. Boring web-based administration tasks can (and should!) also be automated as well.
+
+Selenium has the support of some of the largest browser vendors who have taken (or are taking) steps to make Selenium a native part of their browser. It is also the core technology in countless other browser automation tools, APIs and frameworks.
+
+See the Selenium [site](http://docs.seleniumhq.org/) for documation on usage within your test code.
+
+## License
+
+View [license information](https://github.com/SeleniumHQ/docker-selenium/blob/master/LICENSE.md) for the software contained in this image.
+
+## Getting Help
+
+### User Group
+
+The first place where people ask for help about Selenium is the [Official User Group](https://groups.google.com/forum/#!forum/selenium-users). Here, you'll find that most of the time, someone already found the problem you are facing right now, and usually reached the solution for which you are looking.
+
+_Note: Please make sure to search the group before asking for something. Your question likely won't get answered if it was previously answered in another discussion!_
+
+### Chat Room
+
+The best place to ask for help is the user group (because they also keep the information accessible for others to read in the future). However, if you have a very important (or too simple) issue that needs a solution ASAP, you can always enter the IRC chat room. You might just find someone ready to help on `#selenium` at [Freenode](https://freenode.net/).
+
+### Issues
+
+If you have any problems with or questions about this image, please contact us through a [Github issue](https://github.com/SeleniumHQ/docker-selenium/issues). If you have any problems with or questions about Selenium, please contact us through Selenium's [Bug Tracker](https://code.google.com/p/selenium/issues/list).
+
+## Contributing
+
+There are many ways to [contribute](http://docs.seleniumhq.org/about/getting-involved.jsp) whether by answering user questions, additional docs, or pull request we look forward to hearing from you.
+
+If you do supply a patch we will need you to [sign the CLA](https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dFFjXzBzM1VwekFlOWFWMjFFRjJMRFE6MQ#gid=0). We are part of [SFC](http://www.sfconservancy.org/)
diff --git a/NodeFirefoxNightly/generate.sh b/NodeFirefoxNightly/generate.sh
new file mode 100755
index 0000000000..8877b18b4f
--- /dev/null
+++ b/NodeFirefoxNightly/generate.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+VERSION=$1
+
+echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
+echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
+echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
+echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
+echo FROM selenium/node-base:$VERSION >> ./Dockerfile
+cat ./Dockerfile.txt >> ./Dockerfile
diff --git a/NodeFirefoxNightly/generate_config b/NodeFirefoxNightly/generate_config
new file mode 100644
index 0000000000..d122b9a060
--- /dev/null
+++ b/NodeFirefoxNightly/generate_config
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+FIREFOX_VERSION=$( firefox -version | cut -d " " -f 3 )
+
+echo "
+{
+  \"capabilities\": [
+    {
+      \"version\": \"$FIREFOX_VERSION\",
+      \"browserName\": \"firefox\",
+      \"maxInstances\": $NODE_MAX_INSTANCES,
+      \"seleniumProtocol\": \"WebDriver\",
+      \"applicationName\": \"$NODE_APPLICATION_NAME\"
+    }
+  ],
+  \"proxy\": \"org.openqa.grid.selenium.proxy.DefaultRemoteProxy\",
+  \"maxSession\": $NODE_MAX_SESSION,
+  \"port\": $NODE_PORT,
+  \"register\": true,
+  \"registerCycle\": $NODE_REGISTER_CYCLE,
+  \"nodePolling\": $NODE_POLLING,
+  \"unregisterIfStillDownAfter\": $NODE_UNREGISTER_IF_STILL_DOWN_AFTER,
+  \"downPollingLimit\": $NODE_DOWN_POLLING_LIMIT
+}"

From 435b0ffba64e99a66a59b6889976d64f4e0e5387 Mon Sep 17 00:00:00 2001
From: Shawn Mccarthy <smccarthy@godaddy.com>
Date: Wed, 26 Apr 2017 13:01:49 -0700
Subject: [PATCH 2/6] Use geckodriver in version and tag it with latest too

---
 Makefile | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index a11a54ee38..f7c4914801 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ MINOR := $(word 2,$(subst ., ,$(VERSION)))
 MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(VERSION)))
 NIGHTLY_VERSION := $(shell date +%m%d%Y>&1)
 LATEST_GECKODRIVER_URL := $(shell curl -s https://api.github.com/repos/mozilla/geckodriver/releases | grep browser_download_url | grep 'linux64.tar.gz' | head -n 1 | cut -d '"' -f 4 >&1)
+GECKODRIVER_VERSION := $(shell curl -s https://api.github.com/repos/mozilla/geckodriver/releases | grep tag_name | head -n 1 | cut -d '"' -f 4 | cut -d "v" -f 2 >&1)
 
 all: hub chrome firefox firefox_nightly phantomjs chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
 
@@ -59,7 +60,7 @@ generate_firefox_nightly:
 	cd ./NodeFirefoxNightly && ./generate.sh $(VERSION)
 
 firefox_nightly: nodebase generate_firefox_nightly
-	cd ./NodeFirefoxNightly && docker build $(BUILD_ARGS) --build-arg GECKODRIVER_URL=$(LATEST_GECKODRIVER_URL) -t $(NAME)/node-firefox-nightly:$(NIGHTLY_VERSION) .
+	cd ./NodeFirefoxNightly && docker build $(BUILD_ARGS) --build-arg GECKODRIVER_URL=$(LATEST_GECKODRIVER_URL) -t $(NAME)/node-firefox-nightly:$(NIGHTLY_VERSION)-$(GECKODRIVER_VERSION) .
 
 generate_standalone_firefox:
 	cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION)
@@ -109,7 +110,7 @@ tag_latest:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:latest
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:latest
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:latest
-	docker tag $(NAME)/node-firefox-nightly:$(VERSION) $(NAME)/node-firefox-nightly:latest
+	docker tag $(NAME)/node-firefox-nightly:$(NIGHTLY_VERSION)-$(GECKODRIVER_VERSION) $(NAME)/node-firefox-nightly:latest
 	docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:latest
 	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:latest
 	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:latest
@@ -139,7 +140,6 @@ tag_major_minor:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR)
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR)
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR)
-#	docker tag $(NAME)/node-firefox-nightly:$(VERSION) $(NAME)/node-firefox-nightly:$(MAJOR)
 	docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:$(MAJOR)
 	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR)
 	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR)
@@ -152,7 +152,6 @@ tag_major_minor:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR).$(MINOR)
-#	docker tag $(NAME)/node-firefox-nightly:$(VERSION) $(NAME)/node-firefox-nightly:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
 	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
@@ -165,7 +164,6 @@ tag_major_minor:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
-#	docker tag $(NAME)/node-firefox-nightly:$(VERSION) $(NAME)/node-firefox-nightly:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR_MINOR_PATCH)
 	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR_MINOR_PATCH)
@@ -180,7 +178,6 @@ release: tag_major_minor
 	@if ! docker images $(NAME)/node-base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-chrome | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-chrome version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-firefox | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-firefox version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	@if ! docker images $(NAME)/node-firefox-nightly | awk '{ print $$2 }' | grep -q -F $(NIGHTLY_VERSION); then echo "$(NAME)/node-firefox-nightly version $(NIGHTLY_VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-phantomjs | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-phantomjs version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-chrome-debug | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-chrome-debug version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-firefox-debug | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-firefox-debug version $(VERSION) is not yet built. Please run 'make build'"; false; fi
@@ -193,7 +190,6 @@ release: tag_major_minor
 	docker push $(NAME)/node-base:$(VERSION)
 	docker push $(NAME)/node-chrome:$(VERSION)
 	docker push $(NAME)/node-firefox:$(VERSION)
-	docker push $(NAME)/node-firefox-nightly:$(NIGHTLY_VERSION)
 	docker push $(NAME)/node-phantomjs:$(VERSION)
 	docker push $(NAME)/node-chrome-debug:$(VERSION)
 	docker push $(NAME)/node-firefox-debug:$(VERSION)
@@ -207,7 +203,6 @@ release: tag_major_minor
 	docker push $(NAME)/node-base:$(MAJOR)
 	docker push $(NAME)/node-chrome:$(MAJOR)
 	docker push $(NAME)/node-firefox:$(MAJOR)
-#	docker push $(NAME)/node-firefox-nightly:$(MAJOR)
 	docker push $(NAME)/node-phantomjs:$(MAJOR)
 	docker push $(NAME)/node-chrome-debug:$(MAJOR)
 	docker push $(NAME)/node-firefox-debug:$(MAJOR)
@@ -221,7 +216,6 @@ release: tag_major_minor
 	docker push $(NAME)/node-base:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-chrome:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-firefox:$(MAJOR).$(MINOR)
-#	docker push $(NAME)/node-firefox-nightly:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-phantomjs:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
 	docker push $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
@@ -235,7 +229,6 @@ release: tag_major_minor
 	docker push $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
-#	docker push $(NAME)/node-firefox-nightly:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-phantomjs:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-chrome-debug:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/node-firefox-debug:$(MAJOR_MINOR_PATCH)

From 95920ad9d485f3cf2beccc6907a6d660b72c46ae Mon Sep 17 00:00:00 2001
From: Shawn Mccarthy <smccarthy@godaddy.com>
Date: Sun, 31 Dec 2017 07:38:12 -0700
Subject: [PATCH 3/6] use same firefox image for nightly

---
 Makefile                            | 39 ++----------------
 NodeFirefox/Dockerfile.txt          |  7 ++--
 NodeFirefoxNightly/.gitignore       |  2 -
 NodeFirefoxNightly/Dockerfile.txt   | 62 -----------------------------
 NodeFirefoxNightly/README-short.txt |  1 -
 NodeFirefoxNightly/README.md        | 54 -------------------------
 NodeFirefoxNightly/generate.sh      |  9 -----
 NodeFirefoxNightly/generate_config  | 24 -----------
 8 files changed, 6 insertions(+), 192 deletions(-)
 delete mode 100644 NodeFirefoxNightly/.gitignore
 delete mode 100644 NodeFirefoxNightly/Dockerfile.txt
 delete mode 100644 NodeFirefoxNightly/README-short.txt
 delete mode 100644 NodeFirefoxNightly/README.md
 delete mode 100755 NodeFirefoxNightly/generate.sh
 delete mode 100644 NodeFirefoxNightly/generate_config

diff --git a/Makefile b/Makefile
index 008be0a1ae..c9723cce2a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,26 +7,15 @@ BUILD_ARGS := $(BUILD_ARGS)
 MAJOR := $(word 1,$(subst ., ,$(VERSION)))
 MINOR := $(word 2,$(subst ., ,$(VERSION)))
 MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(VERSION)))
-NIGHTLY_VERSION := $(shell date +%m%d%Y>&1)
-LATEST_GECKODRIVER_URL := $(shell curl -s https://api.github.com/repos/mozilla/geckodriver/releases | grep browser_download_url | grep 'linux64.tar.gz' | head -n 1 | cut -d '"' -f 4 >&1)
-GECKODRIVER_VERSION := $(shell curl -s https://api.github.com/repos/mozilla/geckodriver/releases | grep tag_name | head -n 1 | cut -d '"' -f 4 | cut -d "v" -f 2 >&1)
+LATEST_GECKODRIVER_VERSION := $(shell curl -s https://api.github.com/repos/mozilla/geckodriver/releases | grep tag_name | head -n 1 | cut -d '"' -f 4 | cut -d "v" -f 2 >&1)
 
-<<<<<<< HEAD
-all: hub chrome firefox firefox_nightly phantomjs chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
-=======
 all: hub chrome firefox chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
->>>>>>> upstream/master
 
 generate_all:	\
 	generate_hub \
 	generate_nodebase \
 	generate_chrome \
 	generate_firefox \
-<<<<<<< HEAD
-	generate_firefox_nightly \
-	generate_phantomjs \
-=======
->>>>>>> upstream/master
 	generate_chrome_debug \
 	generate_firefox_debug \
 	generate_standalone_firefox \
@@ -65,11 +54,8 @@ generate_firefox:
 firefox: nodebase generate_firefox
 	cd ./NodeFirefox && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox:$(VERSION) .
 
-generate_firefox_nightly:
-	cd ./NodeFirefoxNightly && ./generate.sh $(VERSION)
-
-firefox_nightly: nodebase generate_firefox_nightly
-	cd ./NodeFirefoxNightly && docker build $(BUILD_ARGS) --build-arg GECKODRIVER_URL=$(LATEST_GECKODRIVER_URL) -t $(NAME)/node-firefox-nightly:$(NIGHTLY_VERSION)-$(GECKODRIVER_VERSION) .
+firefox_nightly: nodebase generate_firefox
+	cd ./NodeFirefox && docker build $(BUILD_ARGS) --build-arg FIREFOX_VERSION=nightly --build-arg GECKODRIVER_VERSION=$(LATEST_GECKODRIVER_VERSION) -t $(NAME)/node-firefox:nightly .
 
 generate_standalone_firefox:
 	cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION) $(NAMESPACE) $(AUTHORS)
@@ -113,11 +99,6 @@ tag_latest:
 	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:latest
 	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:latest
 	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:latest
-<<<<<<< HEAD
-	docker tag $(NAME)/node-firefox-nightly:$(NIGHTLY_VERSION)-$(GECKODRIVER_VERSION) $(NAME)/node-firefox-nightly:latest
-	docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:latest
-=======
->>>>>>> upstream/master
 	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:latest
 	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:latest
 	docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:latest
@@ -131,11 +112,6 @@ release_latest:
 	docker push $(NAME)/node-base:latest
 	docker push $(NAME)/node-chrome:latest
 	docker push $(NAME)/node-firefox:latest
-<<<<<<< HEAD
-	docker push $(NAME)/node-firefox-nightly:latest
-	docker push $(NAME)/node-phantomjs:latest
-=======
->>>>>>> upstream/master
 	docker push $(NAME)/node-chrome-debug:latest
 	docker push $(NAME)/node-firefox-debug:latest
 	docker push $(NAME)/standalone-chrome:latest
@@ -287,21 +263,12 @@ test_firefox_standalone_debug:
 	ci \
 	firefox \
 	firefox_debug \
-<<<<<<< HEAD
 	firefox_nightly \
-	phantomjs \
-=======
->>>>>>> upstream/master
 	generate_all \
 	generate_hub \
 	generate_nodebase \
 	generate_chrome \
 	generate_firefox \
-<<<<<<< HEAD
-	generate_firefox_nightly \
-	generate_phantomjs \
-=======
->>>>>>> upstream/master
 	generate_chrome_debug \
 	generate_firefox_debug \
 	generate_standalone_chrome \
diff --git a/NodeFirefox/Dockerfile.txt b/NodeFirefox/Dockerfile.txt
index 28607be517..71864c841c 100644
--- a/NodeFirefox/Dockerfile.txt
+++ b/NodeFirefox/Dockerfile.txt
@@ -4,10 +4,11 @@ USER root
 # Firefox
 #=========
 ARG FIREFOX_VERSION=57.0.2
-RUN apt-get update -qqy \
+RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "nightly" ]; then echo "https://download.mozilla.org/?product=firefox-nightly-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/* \
-  && 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 \
+  && wget --no-verbose -O /tmp/firefox.tar.bz2 $FIREFOX_DOWNLOAD_URL \
   && apt-get -y purge firefox \
   && rm -rf /opt/firefox \
   && tar -C /opt -xjf /tmp/firefox.tar.bz2 \
@@ -41,5 +42,3 @@ RUN sudo echo ""
 
 # Generating a default config during build time
 RUN /opt/bin/generate_config > /opt/selenium/config.json
-
-
diff --git a/NodeFirefoxNightly/.gitignore b/NodeFirefoxNightly/.gitignore
deleted file mode 100644
index 205411cbea..0000000000
--- a/NodeFirefoxNightly/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Dockerfile will be generated.
-Dockerfile
diff --git a/NodeFirefoxNightly/Dockerfile.txt b/NodeFirefoxNightly/Dockerfile.txt
deleted file mode 100644
index d58e66aa02..0000000000
--- a/NodeFirefoxNightly/Dockerfile.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-MAINTAINER Selenium <selenium-developers@googlegroups.com>
-
-USER root
-
-#=========
-# Firefox
-#=========
-ARG FIREFOX_VERSION=nightly
-RUN apt-get update -qqy \
-  && apt-get -qqy --no-install-recommends install firefox \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
-  && wget --no-verbose -O /tmp/firefox.tar.bz2 "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=linux64&lang=en-US" \
-  && 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
-
-#============
-# GeckoDriver
-#============
-ARG GECKODRIVER_VERSION=latest
-ARG GECKODRIVER_URL
-
-RUN wget --no-verbose -O /tmp/geckodriver.tar.gz $GECKODRIVER_URL \
-  && rm -rf /opt/geckodriver \
-  && tar -C /opt -zxf /tmp/geckodriver.tar.gz \
-  && rm /tmp/geckodriver.tar.gz \
-  && mv /opt/geckodriver /opt/geckodriver-$GECKODRIVER_VERSION \
-  && chmod 755 /opt/geckodriver-$GECKODRIVER_VERSION \
-  && ln -fs /opt/geckodriver-$GECKODRIVER_VERSION /usr/bin/geckodriver
-
-#========================
-# Selenium Configuration
-#========================
-# As integer, maps to "maxInstances"
-ENV NODE_MAX_INSTANCES 1
-# As integer, maps to "maxSession"
-ENV NODE_MAX_SESSION 1
-# As integer, maps to "port"
-ENV NODE_PORT 5555
-# In milliseconds, maps to "registerCycle"
-ENV NODE_REGISTER_CYCLE 5000
-# In milliseconds, maps to "nodePolling"
-ENV NODE_POLLING 5000
-# In milliseconds, maps to "unregisterIfStillDownAfter"
-ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
-# As integer, maps to "downPollingLimit"
-ENV NODE_DOWN_POLLING_LIMIT 2
-# As string, maps to "applicationName"
-ENV NODE_APPLICATION_NAME ""
-
-COPY generate_config /opt/selenium/generate_config
-RUN chmod +x /opt/selenium/generate_config \
-  && chown -R seluser:seluser /opt/selenium
-
-# Following line fixes
-# https://github.com/SeleniumHQ/docker-selenium/issues/87
-RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
-
-USER seluser
diff --git a/NodeFirefoxNightly/README-short.txt b/NodeFirefoxNightly/README-short.txt
deleted file mode 100644
index 992d5c0004..0000000000
--- a/NodeFirefoxNightly/README-short.txt
+++ /dev/null
@@ -1 +0,0 @@
-Selenium Node configured to run Firefox
diff --git a/NodeFirefoxNightly/README.md b/NodeFirefoxNightly/README.md
deleted file mode 100644
index b03730638c..0000000000
--- a/NodeFirefoxNightly/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Selenium Grid Node - Firefox
-
-Selenium Node configured to run Firefox
-
-## Dockerfile
-
-[`selenium/node-firefox` Dockerfile](https://github.com/SeleniumHQ/docker-selenium/blob/master/NodeFirefox/Dockerfile)
-
-## How to use this image
-
-First, you will need a Selenium Grid Hub that the Node will connect to.
-
-```
-$ docker run -d -P --name selenium-hub selenium/hub
-```
-
-Once the hub is up and running will want to launch nodes that can run tests. You can run as many nodes as you wish.
-
-```
-$ docker run -d --link selenium-hub:hub selenium/node-firefox
-```
-
-## What is Selenium?
-_Selenium automates browsers._ That's it! What you do with that power is entirely up to you. Primarily, it is for automating web applications for testing purposes, but is certainly not limited to just that. Boring web-based administration tasks can (and should!) also be automated as well.
-
-Selenium has the support of some of the largest browser vendors who have taken (or are taking) steps to make Selenium a native part of their browser. It is also the core technology in countless other browser automation tools, APIs and frameworks.
-
-See the Selenium [site](http://docs.seleniumhq.org/) for documation on usage within your test code.
-
-## License
-
-View [license information](https://github.com/SeleniumHQ/docker-selenium/blob/master/LICENSE.md) for the software contained in this image.
-
-## Getting Help
-
-### User Group
-
-The first place where people ask for help about Selenium is the [Official User Group](https://groups.google.com/forum/#!forum/selenium-users). Here, you'll find that most of the time, someone already found the problem you are facing right now, and usually reached the solution for which you are looking.
-
-_Note: Please make sure to search the group before asking for something. Your question likely won't get answered if it was previously answered in another discussion!_
-
-### Chat Room
-
-The best place to ask for help is the user group (because they also keep the information accessible for others to read in the future). However, if you have a very important (or too simple) issue that needs a solution ASAP, you can always enter the IRC chat room. You might just find someone ready to help on `#selenium` at [Freenode](https://freenode.net/).
-
-### Issues
-
-If you have any problems with or questions about this image, please contact us through a [Github issue](https://github.com/SeleniumHQ/docker-selenium/issues). If you have any problems with or questions about Selenium, please contact us through Selenium's [Bug Tracker](https://code.google.com/p/selenium/issues/list).
-
-## Contributing
-
-There are many ways to [contribute](http://docs.seleniumhq.org/about/getting-involved.jsp) whether by answering user questions, additional docs, or pull request we look forward to hearing from you.
-
-If you do supply a patch we will need you to [sign the CLA](https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dFFjXzBzM1VwekFlOWFWMjFFRjJMRFE6MQ#gid=0). We are part of [SFC](http://www.sfconservancy.org/)
diff --git a/NodeFirefoxNightly/generate.sh b/NodeFirefoxNightly/generate.sh
deleted file mode 100755
index 8877b18b4f..0000000000
--- a/NodeFirefoxNightly/generate.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-VERSION=$1
-
-echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
-echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
-echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
-echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
-echo FROM selenium/node-base:$VERSION >> ./Dockerfile
-cat ./Dockerfile.txt >> ./Dockerfile
diff --git a/NodeFirefoxNightly/generate_config b/NodeFirefoxNightly/generate_config
deleted file mode 100644
index d122b9a060..0000000000
--- a/NodeFirefoxNightly/generate_config
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-FIREFOX_VERSION=$( firefox -version | cut -d " " -f 3 )
-
-echo "
-{
-  \"capabilities\": [
-    {
-      \"version\": \"$FIREFOX_VERSION\",
-      \"browserName\": \"firefox\",
-      \"maxInstances\": $NODE_MAX_INSTANCES,
-      \"seleniumProtocol\": \"WebDriver\",
-      \"applicationName\": \"$NODE_APPLICATION_NAME\"
-    }
-  ],
-  \"proxy\": \"org.openqa.grid.selenium.proxy.DefaultRemoteProxy\",
-  \"maxSession\": $NODE_MAX_SESSION,
-  \"port\": $NODE_PORT,
-  \"register\": true,
-  \"registerCycle\": $NODE_REGISTER_CYCLE,
-  \"nodePolling\": $NODE_POLLING,
-  \"unregisterIfStillDownAfter\": $NODE_UNREGISTER_IF_STILL_DOWN_AFTER,
-  \"downPollingLimit\": $NODE_DOWN_POLLING_LIMIT
-}"

From 2463fc64f9f9aa5a26966a94445156ddb74b6e4b Mon Sep 17 00:00:00 2001
From: Shawn Mccarthy <smccarthy@godaddy.com>
Date: Sun, 31 Dec 2017 07:55:30 -0700
Subject: [PATCH 4/6] add tag and release nightly

---
 Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Makefile b/Makefile
index c9723cce2a..07caf8b8b1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ BUILD_ARGS := $(BUILD_ARGS)
 MAJOR := $(word 1,$(subst ., ,$(VERSION)))
 MINOR := $(word 2,$(subst ., ,$(VERSION)))
 MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(VERSION)))
+NIGHTLY_VERSION := $(shell date +%m%d%Y>&1)
 LATEST_GECKODRIVER_VERSION := $(shell curl -s https://api.github.com/repos/mozilla/geckodriver/releases | grep tag_name | head -n 1 | cut -d '"' -f 4 | cut -d "v" -f 2 >&1)
 
 all: hub chrome firefox chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
@@ -93,6 +94,14 @@ generate_firefox_debug:
 firefox_debug: generate_firefox_debug firefox
 	cd ./NodeFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox-debug:$(VERSION) .
 
+tag_nightly:
+	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:nightly
+	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(NIGHTLY_VERSION)
+
+release_nightly:
+	docker push $(NAME)/node-firefox:nightly
+	docker push $(NAME)/node-firefox:$(NIGHTLY_VERSION)
+
 tag_latest:
 	docker tag $(NAME)/base:$(VERSION) $(NAME)/base:latest
 	docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:latest

From 88ae1f0c29779ba4aa9a7453f5761b2b5dc05312 Mon Sep 17 00:00:00 2001
From: Shawn Mccarthy <smccarthy@godaddy.com>
Date: Sun, 31 Dec 2017 08:34:40 -0700
Subject: [PATCH 5/6] forgot to include firefox_nightly in all target

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 07caf8b8b1..4a2a6a6176 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(VERSION)))
 NIGHTLY_VERSION := $(shell date +%m%d%Y>&1)
 LATEST_GECKODRIVER_VERSION := $(shell curl -s https://api.github.com/repos/mozilla/geckodriver/releases | grep tag_name | head -n 1 | cut -d '"' -f 4 | cut -d "v" -f 2 >&1)
 
-all: hub chrome firefox chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
+all: hub chrome firefox firefox_nightly chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
 
 generate_all:	\
 	generate_hub \

From c84f34177a0987c5b5c7bdac23796e2ccb97dd2a Mon Sep 17 00:00:00 2001
From: Shawn Mccarthy <smccarthy@godaddy.com>
Date: Wed, 10 Jan 2018 21:14:01 -0700
Subject: [PATCH 6/6] revert Makefile changes

---
 Makefile | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 3054879669..7c4ed6b0ff 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,8 @@ BUILD_ARGS := $(BUILD_ARGS)
 MAJOR := $(word 1,$(subst ., ,$(VERSION)))
 MINOR := $(word 2,$(subst ., ,$(VERSION)))
 MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(VERSION)))
-NIGHTLY_VERSION := $(shell date +%m%d%Y>&1)
-LATEST_GECKODRIVER_VERSION := $(shell curl -s https://api.github.com/repos/mozilla/geckodriver/releases | grep tag_name | head -n 1 | cut -d '"' -f 4 | cut -d "v" -f 2 >&1)
 
-all: hub chrome firefox firefox_nightly chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
+all: hub chrome firefox chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
 
 generate_all:	\
 	generate_hub \
@@ -55,9 +53,6 @@ generate_firefox:
 firefox: nodebase generate_firefox
 	cd ./NodeFirefox && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox:$(VERSION) .
 
-firefox_nightly: nodebase generate_firefox
-	cd ./NodeFirefox && docker build $(BUILD_ARGS) --build-arg FIREFOX_VERSION=nightly --build-arg GECKODRIVER_VERSION=$(LATEST_GECKODRIVER_VERSION) -t $(NAME)/node-firefox:nightly .
-
 generate_standalone_firefox:
 	cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION) $(NAMESPACE) $(AUTHORS)
 
@@ -94,14 +89,6 @@ generate_firefox_debug:
 firefox_debug: generate_firefox_debug firefox
 	cd ./NodeFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox-debug:$(VERSION) .
 
-tag_nightly:
-	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:nightly
-	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(NIGHTLY_VERSION)
-
-release_nightly:
-	docker push $(NAME)/node-firefox:nightly
-	docker push $(NAME)/node-firefox:$(NIGHTLY_VERSION)
-
 tag_latest:
 	docker tag $(NAME)/base:$(VERSION) $(NAME)/base:latest
 	docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:latest
@@ -272,7 +259,6 @@ test_firefox_standalone_debug:
 	ci \
 	firefox \
 	firefox_debug \
-	firefox_nightly \
 	generate_all \
 	generate_hub \
 	generate_nodebase \