Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ https://sites.google.com/a/chromium.org/chromedriver/help
If the issue is with Firefox GeckoDriver (aka Marionette) consider logging an issue with Mozilla:
https://bugzilla.mozilla.org/buglist.cgi?product=Testing&component=Marionette

If the issue is with PhantomJS consider logging an issue with Ghostdriver:
https://github.com/detro/ghostdriver
-->
## Expected Behavior -

Expand Down
24 changes: 1 addition & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ MAJOR := $(word 1,$(subst ., ,$(VERSION)))
MINOR := $(word 2,$(subst ., ,$(VERSION)))
MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(VERSION)))

all: hub chrome firefox 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

generate_all: \
generate_hub \
generate_nodebase \
generate_chrome \
generate_firefox \
generate_phantomjs \
generate_chrome_debug \
generate_firefox_debug \
generate_standalone_firefox \
Expand Down Expand Up @@ -90,19 +89,12 @@ generate_firefox_debug:
firefox_debug: generate_firefox_debug firefox
cd ./NodeFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox-debug:$(VERSION) .

generate_phantomjs:
cd ./NodePhantomJS && ./generate.sh $(VERSION) $(NAMESPACE) $(AUTHORS)

phantomjs: nodebase generate_phantomjs
cd ./NodePhantomJS && docker build $(BUILD_ARGS) -t $(NAME)/node-phantomjs:$(VERSION) .

tag_latest:
docker tag $(NAME)/base:$(VERSION) $(NAME)/base:latest
docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub: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-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
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:latest
Expand All @@ -116,7 +108,6 @@ release_latest:
docker push $(NAME)/node-base:latest
docker push $(NAME)/node-chrome:latest
docker push $(NAME)/node-firefox:latest
docker push $(NAME)/node-phantomjs:latest
docker push $(NAME)/node-chrome-debug:latest
docker push $(NAME)/node-firefox-debug:latest
docker push $(NAME)/standalone-chrome:latest
Expand All @@ -130,7 +121,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-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)
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR)
Expand All @@ -142,7 +132,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-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)
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
Expand All @@ -154,7 +143,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-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)
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR_MINOR_PATCH)
Expand All @@ -168,7 +156,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-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
@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
Expand All @@ -180,7 +167,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-phantomjs:$(VERSION)
docker push $(NAME)/node-chrome-debug:$(VERSION)
docker push $(NAME)/node-firefox-debug:$(VERSION)
docker push $(NAME)/standalone-chrome:$(VERSION)
Expand All @@ -193,7 +179,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-phantomjs:$(MAJOR)
docker push $(NAME)/node-chrome-debug:$(MAJOR)
docker push $(NAME)/node-firefox-debug:$(MAJOR)
docker push $(NAME)/standalone-chrome:$(MAJOR)
Expand All @@ -206,7 +191,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-phantomjs:$(MAJOR).$(MINOR)
docker push $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
docker push $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
docker push $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
Expand All @@ -219,7 +203,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-phantomjs:$(MAJOR_MINOR_PATCH)
docker push $(NAME)/node-chrome-debug:$(MAJOR_MINOR_PATCH)
docker push $(NAME)/node-firefox-debug:$(MAJOR_MINOR_PATCH)
docker push $(NAME)/standalone-chrome:$(MAJOR_MINOR_PATCH)
Expand Down Expand Up @@ -266,9 +249,6 @@ test_firefox_standalone:
test_firefox_standalone_debug:
VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefoxDebug

test_phantomjs:
VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodePhantomJS


.PHONY: \
all \
Expand All @@ -279,13 +259,11 @@ test_phantomjs:
ci \
firefox \
firefox_debug \
phantomjs \
generate_all \
generate_hub \
generate_nodebase \
generate_chrome \
generate_firefox \
generate_phantomjs \
generate_chrome_debug \
generate_firefox_debug \
generate_standalone_chrome \
Expand Down
37 changes: 0 additions & 37 deletions NodePhantomJS/Dockerfile

This file was deleted.

30 changes: 0 additions & 30 deletions NodePhantomJS/Dockerfile.txt

This file was deleted.

1 change: 0 additions & 1 deletion NodePhantomJS/README-short.txt

This file was deleted.

54 changes: 0 additions & 54 deletions NodePhantomJS/README.md

This file was deleted.

23 changes: 0 additions & 23 deletions NodePhantomJS/entry_point.sh

This file was deleted.

13 changes: 0 additions & 13 deletions NodePhantomJS/generate.sh

This file was deleted.

9 changes: 0 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Images included:
- __selenium/node-base__: Base image for Selenium Grid Nodes which includes a virtual desktop environment and VNC support
- __selenium/node-chrome__: Selenium node with Chrome installed, needs to be connected to a Selenium Grid Hub
- __selenium/node-firefox__: Selenium node with Firefox installed, needs to be connected to a Selenium Grid Hub
- __selenium/node-phantomjs__: Selenium node with PhantomJS installed, needs to be connected to a Selenium Grid Hub
- __selenium/standalone-chrome__: Selenium standalone with Chrome installed
- __selenium/standalone-firefox__: Selenium standalone with Firefox installed
- __selenium/standalone-chrome-debug__: Selenium standalone with Chrome installed and runs a VNC server
Expand Down Expand Up @@ -93,14 +92,6 @@ $ docker run -d -p 4444:4444 -e HUB_PORT_4444_TCP_ADDR=10.10.1.10 -e HUB_PORT_44
--name selenium-hub selenium/hub:3.7.1-beryllium
```

### PHANTOMJS_OPTS PhantomJS Configuration Options

``` bash
$ docker run -d -e PHANTOMJS_OPTS="--ignore-ssl-errors=true" --link selenium-hub:hub selenium/node-phantomjs:3.7.1-beryllium
```

You can pass `SE_OPTS` variable with additional commandline parameters for starting a PhantomJS node.

## Building the images

Clone the repo and from the project directory root you can build everything by running:
Expand Down
6 changes: 0 additions & 6 deletions tests/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
'NodeFirefoxDebug': 'node-firefox-debug',
'StandaloneFirefox': 'standalone-firefox',
'StandaloneFirefoxDebug': 'standalone-firefox-debug',

# PhantomJS Images
'NodePhantomJS': 'node-phantomjs',
}

TEST_NAME_MAP = {
Expand All @@ -48,9 +45,6 @@
'NodeFirefoxDebug': 'FirefoxTests',
'StandaloneFirefox': 'FirefoxTests',
'StandaloneFirefoxDebug': 'FirefoxTests',

# PhantomJS Images
'NodePhantomJS': 'PhantomJSTests',
}


Expand Down