Skip to content

Commit 1ed0c7b

Browse files
pabloFuentepabloFuente
committed
Merge branch 'master' of git://github.com/SeleniumHQ/docker-selenium
Update branch to master
2 parents 83c7173 + 84be4c6 commit 1ed0c7b

21 files changed

+23
-408
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ https://sites.google.com/a/chromium.org/chromedriver/help
1717
If the issue is with Firefox GeckoDriver (aka Marionette) consider logging an issue with Mozilla:
1818
https://bugzilla.mozilla.org/buglist.cgi?product=Testing&component=Marionette
1919
20-
If the issue is with PhantomJS consider logging an issue with Ghostdriver:
21-
https://github.com/detro/ghostdriver
2220
-->
2321
## Expected Behavior -
2422

‎Makefile‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ MAJOR := $(word 1,$(subst ., ,$(VERSION)))
88
MINOR := $(word 2,$(subst ., ,$(VERSION)))
99
MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(VERSION)))
1010

11-
all: hub chrome firefox phantomjs chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
11+
all: hub chrome firefox chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
1212

1313
generate_all: \
1414
generate_hub \
1515
generate_nodebase \
1616
generate_chrome \
1717
generate_firefox \
18-
generate_phantomjs \
1918
generate_chrome_debug \
2019
generate_firefox_debug \
2120
generate_standalone_firefox \
@@ -90,19 +89,12 @@ generate_firefox_debug:
9089
firefox_debug: generate_firefox_debug firefox
9190
cd ./NodeFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox-debug:$(VERSION) .
9291

93-
generate_phantomjs:
94-
cd ./NodePhantomJS && ./generate.sh $(VERSION) $(NAMESPACE) $(AUTHORS)
95-
96-
phantomjs: nodebase generate_phantomjs
97-
cd ./NodePhantomJS && docker build $(BUILD_ARGS) -t $(NAME)/node-phantomjs:$(VERSION) .
98-
9992
tag_latest:
10093
docker tag $(NAME)/base:$(VERSION) $(NAME)/base:latest
10194
docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:latest
10295
docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:latest
10396
docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:latest
10497
docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:latest
105-
docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:latest
10698
docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:latest
10799
docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:latest
108100
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:latest
@@ -116,7 +108,6 @@ release_latest:
116108
docker push $(NAME)/node-base:latest
117109
docker push $(NAME)/node-chrome:latest
118110
docker push $(NAME)/node-firefox:latest
119-
docker push $(NAME)/node-phantomjs:latest
120111
docker push $(NAME)/node-chrome-debug:latest
121112
docker push $(NAME)/node-firefox-debug:latest
122113
docker push $(NAME)/standalone-chrome:latest
@@ -130,7 +121,6 @@ tag_major_minor:
130121
docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR)
131122
docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR)
132123
docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR)
133-
docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:$(MAJOR)
134124
docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR)
135125
docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR)
136126
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR)
@@ -142,7 +132,6 @@ tag_major_minor:
142132
docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR).$(MINOR)
143133
docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR).$(MINOR)
144134
docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR).$(MINOR)
145-
docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:$(MAJOR).$(MINOR)
146135
docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
147136
docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
148137
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
@@ -154,7 +143,6 @@ tag_major_minor:
154143
docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
155144
docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
156145
docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
157-
docker tag $(NAME)/node-phantomjs:$(VERSION) $(NAME)/node-phantomjs:$(MAJOR_MINOR_PATCH)
158146
docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR_MINOR_PATCH)
159147
docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR_MINOR_PATCH)
160148
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR_MINOR_PATCH)
@@ -168,7 +156,6 @@ release: tag_major_minor
168156
@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
169157
@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
170158
@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
171-
@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
172159
@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
173160
@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
174161
@if ! docker images $(NAME)/standalone-chrome | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/standalone-chrome version $(VERSION) is not yet built. Please run 'make build'"; false; fi
@@ -180,7 +167,6 @@ release: tag_major_minor
180167
docker push $(NAME)/node-base:$(VERSION)
181168
docker push $(NAME)/node-chrome:$(VERSION)
182169
docker push $(NAME)/node-firefox:$(VERSION)
183-
docker push $(NAME)/node-phantomjs:$(VERSION)
184170
docker push $(NAME)/node-chrome-debug:$(VERSION)
185171
docker push $(NAME)/node-firefox-debug:$(VERSION)
186172
docker push $(NAME)/standalone-chrome:$(VERSION)
@@ -193,7 +179,6 @@ release: tag_major_minor
193179
docker push $(NAME)/node-base:$(MAJOR)
194180
docker push $(NAME)/node-chrome:$(MAJOR)
195181
docker push $(NAME)/node-firefox:$(MAJOR)
196-
docker push $(NAME)/node-phantomjs:$(MAJOR)
197182
docker push $(NAME)/node-chrome-debug:$(MAJOR)
198183
docker push $(NAME)/node-firefox-debug:$(MAJOR)
199184
docker push $(NAME)/standalone-chrome:$(MAJOR)
@@ -206,7 +191,6 @@ release: tag_major_minor
206191
docker push $(NAME)/node-base:$(MAJOR).$(MINOR)
207192
docker push $(NAME)/node-chrome:$(MAJOR).$(MINOR)
208193
docker push $(NAME)/node-firefox:$(MAJOR).$(MINOR)
209-
docker push $(NAME)/node-phantomjs:$(MAJOR).$(MINOR)
210194
docker push $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
211195
docker push $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
212196
docker push $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
@@ -219,7 +203,6 @@ release: tag_major_minor
219203
docker push $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
220204
docker push $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
221205
docker push $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
222-
docker push $(NAME)/node-phantomjs:$(MAJOR_MINOR_PATCH)
223206
docker push $(NAME)/node-chrome-debug:$(MAJOR_MINOR_PATCH)
224207
docker push $(NAME)/node-firefox-debug:$(MAJOR_MINOR_PATCH)
225208
docker push $(NAME)/standalone-chrome:$(MAJOR_MINOR_PATCH)
@@ -228,7 +211,8 @@ release: tag_major_minor
228211
docker push $(NAME)/standalone-chrome-debug:$(MAJOR_MINOR_PATCH)
229212
docker push $(NAME)/standalone-firefox-debug:$(MAJOR_MINOR_PATCH)
230213

231-
test: test_chrome \
214+
test: test_shell_functions \
215+
test_chrome \
232216
test_firefox \
233217
test_chrome_debug \
234218
test_firefox_debug \
@@ -238,6 +222,9 @@ test: test_chrome \
238222
test_firefox_standalone_debug
239223

240224

225+
test_shell_functions:
226+
./tests/test-shell-functions.sh
227+
241228
test_chrome:
242229
VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChrome
243230

@@ -262,9 +249,6 @@ test_firefox_standalone:
262249
test_firefox_standalone_debug:
263250
VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefoxDebug
264251

265-
test_phantomjs:
266-
VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodePhantomJS
267-
268252

269253
.PHONY: \
270254
all \
@@ -275,13 +259,11 @@ test_phantomjs:
275259
ci \
276260
firefox \
277261
firefox_debug \
278-
phantomjs \
279262
generate_all \
280263
generate_hub \
281264
generate_nodebase \
282265
generate_chrome \
283266
generate_firefox \
284-
generate_phantomjs \
285267
generate_chrome_debug \
286268
generate_firefox_debug \
287269
generate_standalone_chrome \

‎NodePhantomJS/Dockerfile‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎NodePhantomJS/Dockerfile.txt‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎NodePhantomJS/README-short.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎NodePhantomJS/README.md‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎NodePhantomJS/entry_point.sh‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎NodePhantomJS/generate.sh‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎README.md‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Images included:
1717
- __selenium/node-base__: Base image for Selenium Grid Nodes which includes a virtual desktop environment and VNC support
1818
- __selenium/node-chrome__: Selenium node with Chrome installed, needs to be connected to a Selenium Grid Hub
1919
- __selenium/node-firefox__: Selenium node with Firefox installed, needs to be connected to a Selenium Grid Hub
20-
- __selenium/node-phantomjs__: Selenium node with PhantomJS installed, needs to be connected to a Selenium Grid Hub
2120
- __selenium/standalone-chrome__: Selenium standalone with Chrome installed
2221
- __selenium/standalone-firefox__: Selenium standalone with Firefox installed
2322
- __selenium/standalone-chrome-debug__: Selenium standalone with Chrome installed and runs a VNC server
@@ -93,14 +92,6 @@ $ docker run -d -p 4444:4444 -e HUB_PORT_4444_TCP_ADDR=10.10.1.10 -e HUB_PORT_44
9392
--name selenium-hub selenium/hub:3.7.1-beryllium
9493
```
9594

96-
### PHANTOMJS_OPTS PhantomJS Configuration Options
97-
98-
``` bash
99-
$ docker run -d -e PHANTOMJS_OPTS="--ignore-ssl-errors=true" --link selenium-hub:hub selenium/node-phantomjs:3.7.1-beryllium
100-
```
101-
102-
You can pass `SE_OPTS` variable with additional commandline parameters for starting a PhantomJS node.
103-
10495
## Building the images
10596

10697
Clone the repo and from the project directory root you can build everything by running:

‎Test/.dockerignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)