Skip to content

Commit 0715c63

Browse files
authored
Merge pull request SeleniumHQ#603 from SeleniumHQ/next-release
Improving makefile, upgrading FF and Geckodriver
2 parents cb676ec + b85903f commit 0715c63

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,25 @@ firefox: nodebase generate_firefox
5757
generate_standalone_firefox:
5858
cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION) $(NAMESPACE) $(AUTHORS)
5959

60-
standalone_firefox: generate_standalone_firefox firefox
60+
standalone_firefox: firefox generate_standalone_firefox
6161
cd ./StandaloneFirefox && docker build $(BUILD_ARGS) -t $(NAME)/standalone-firefox:$(VERSION) .
6262

6363
generate_standalone_firefox_debug:
6464
cd ./StandaloneDebug && ./generate.sh StandaloneFirefoxDebug node-firefox-debug Firefox $(VERSION) $(NAMESPACE) $(AUTHORS)
6565

66-
standalone_firefox_debug: generate_standalone_firefox_debug standalone_firefox
66+
standalone_firefox_debug: firefox_debug generate_standalone_firefox_debug
6767
cd ./StandaloneFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/standalone-firefox-debug:$(VERSION) .
6868

6969
generate_standalone_chrome:
7070
cd ./Standalone && ./generate.sh StandaloneChrome node-chrome Chrome $(VERSION) $(NAMESPACE) $(AUTHORS)
7171

72-
standalone_chrome: generate_standalone_chrome chrome
72+
standalone_chrome: chrome generate_standalone_chrome
7373
cd ./StandaloneChrome && docker build $(BUILD_ARGS) -t $(NAME)/standalone-chrome:$(VERSION) .
7474

7575
generate_standalone_chrome_debug:
7676
cd ./StandaloneDebug && ./generate.sh StandaloneChromeDebug node-chrome-debug Chrome $(VERSION) $(NAMESPACE) $(AUTHORS)
7777

78-
standalone_chrome_debug: chrome_debug generate_standalone_chrome_debug standalone_chrome
78+
standalone_chrome_debug: chrome_debug generate_standalone_chrome_debug
7979
cd ./StandaloneChromeDebug && docker build $(BUILD_ARGS) -t $(NAME)/standalone-chrome-debug:$(VERSION) .
8080

8181
generate_chrome_debug:

NodeFirefox/Dockerfile.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ USER root
33
#=========
44
# Firefox
55
#=========
6-
ARG FIREFOX_VERSION=56.0
6+
ARG FIREFOX_VERSION=56.0.2
77
RUN apt-get update -qqy \
88
&& apt-get -qqy --no-install-recommends install firefox \
99
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
@@ -18,7 +18,7 @@ RUN apt-get update -qqy \
1818
#============
1919
# GeckoDriver
2020
#============
21-
ARG GECKODRIVER_VERSION=0.19.0
21+
ARG GECKODRIVER_VERSION=0.19.1
2222
RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz \
2323
&& rm -rf /opt/geckodriver \
2424
&& tar -C /opt -zxf /tmp/geckodriver.tar.gz \

0 commit comments

Comments
 (0)