-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Add support for Selenium 2.53.1 and Firefox 47.0.1 #251
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM selenium/base:2.53.0 | ||
FROM selenium/base:2.53.1 | ||
MAINTAINER Selenium <[email protected]> | ||
|
||
#======================== | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM selenium/base:2.53.0 | ||
FROM selenium/base:2.53.1 | ||
MAINTAINER Selenium <[email protected]> | ||
|
||
ENV DEBIAN_FRONTEND noninteractive | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. so no matter what time of node you are using, firefox will be in /usr/bin/firefox? say i'm using NodeChrome, /usr/bin/firefox will exist? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i'm aware that it's a no-op if you, of course, do not specify There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Like you point out it will only be created if FIREFOX_VERSION is specified. I'm happy to take another approach if you have an idea? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. would it make more sense to just put this piece in NodeFirefox and NodeFirefoxDebug, StandaloneFirefox and StandaloneFirefoxDebug? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This entry point isn't overridden in some of those, so I think I'd rather keep this here than complicate this further. I'll be opening a new pull request after rebasing from the recent changes shortly. |
||
if [ ! -z "$SE_OPTS" ]; then | ||
echo "appending selenium options: ${SE_OPTS}" | ||
fi | ||
|
@@ -33,7 +37,7 @@ fi | |
|
||
SERVERNUM=$(get_server_num) | ||
xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \ | ||
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \ | ||
java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone-${SELENIUM_VERSION}.jar \ | ||
-role node \ | ||
-hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \ | ||
${REMOTE_HOST_PARAM} \ | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM selenium/node-base:2.53.0 | ||
FROM selenium/node-base:2.53.1 | ||
MAINTAINER Selenium <[email protected]> | ||
|
||
USER root | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM selenium/node-chrome:2.53.0 | ||
FROM selenium/node-chrome:2.53.1 | ||
MAINTAINER Selenium <[email protected]> | ||
|
||
USER root | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,23 @@ | ||
FROM selenium/node-base:2.53.0 | ||
FROM selenium/node-base:2.53.1 | ||
MAINTAINER Selenium <[email protected]> | ||
|
||
USER root | ||
|
||
#========= | ||
# Firefox | ||
#========= | ||
ENV FIREFOX_VERSION 45.0.2 | ||
RUN apt-get update -qqy \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do you move this line below? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the version to be used rather than the version(s) to be downloaded. It made more sense to me to move it to after the downloads, but I can move it back if preferred. |
||
&& 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 | ||
ENV FIREFOX_VERSION 47.0.1 | ||
RUN for VERSION in 47.0.1 46.0.1 45.0.2; do \ | ||
wget --no-verbose -O /tmp/firefox-$VERSION.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/$VERSION/linux-x86_64/en-US/firefox-$VERSION.tar.bz2 \ | ||
&& mkdir -p /opt/firefox/$VERSION \ | ||
&& tar -C /opt/firefox/$VERSION --strip-components 1 -xjf /tmp/firefox-$VERSION.tar.bz2 \ | ||
&& rm /tmp/firefox-$VERSION.tar.bz2 \ | ||
;done | ||
RUN ln -fs /opt/firefox/$FIREFOX_VERSION/firefox /usr/bin/firefox | ||
|
||
#======================== | ||
# Selenium Configuration | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,17 +5,18 @@ USER root | |
#========= | ||
# Firefox | ||
#========= | ||
ENV FIREFOX_VERSION 45.0.2 | ||
RUN apt-get update -qqy \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same questions as above. |
||
&& 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 | ||
ENV FIREFOX_VERSION 47.0.1 | ||
RUN for VERSION in 47.0.1 46.0.1 45.0.2; do \ | ||
wget --no-verbose -O /tmp/firefox-$VERSION.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/$VERSION/linux-x86_64/en-US/firefox-$VERSION.tar.bz2 \ | ||
&& mkdir -p /opt/firefox/$VERSION \ | ||
&& tar -C /opt/firefox/$VERSION --strip-components 1 -xjf /tmp/firefox-$VERSION.tar.bz2 \ | ||
&& rm /tmp/firefox-$VERSION.tar.bz2 \ | ||
;done | ||
RUN ln -fs /opt/firefox/$FIREFOX_VERSION/firefox /usr/bin/firefox | ||
|
||
#======================== | ||
# Selenium Configuration | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM selenium/node-firefox:2.53.0 | ||
FROM selenium/node-firefox:2.53.1 | ||
MAINTAINER Selenium <[email protected]> | ||
|
||
USER root | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line has to go away. You download two versions of Selenium.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is intentional - to allow the user to control which version is used. We wouldn't want to download many versions, but it would allow us for example to include beta versions.