Skip to content
This repository was archived by the owner on May 24, 2018. It is now read-only.

Commit 654897c

Browse files
committed
Change Firefox Node to run Selenium Node Directly
Remove init script for running Selenium node in favor of running the jar directly. Part of SeleniumHQ#3
1 parent 25495f1 commit 654897c

File tree

9 files changed

+20
-98
lines changed

9 files changed

+20
-98
lines changed

Makefile

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,42 +25,26 @@ chrome: nodebase
2525
cd ./NodeChrome && docker build -t $(NAME)/node-chrome:$(VERSION) .
2626

2727
firefox: nodebase
28-
rm -rf firefox_image
29-
mkdir -p firefox_image/build/firefox
30-
cp build/Dockerfile firefox_image/Dockerfile
31-
cp build/install.sh firefox_image/build/install.sh
32-
cp $(COPYARGS) build/firefox firefox_image/build/
33-
cd ./firefox_image && docker build -t $(NAME)/node-firefox:$(VERSION) .
34-
35-
full: nodebase
36-
rm -rf full_image
37-
mkdir -p full_image/build/
38-
cp build/Dockerfile full_image/Dockerfile
39-
cp $(COPYARGS) build/ full_image/build/
40-
cp $(COPYARGS) Hub/etc/ full_image/build/full/etc/
41-
cd ./full_image && docker build -t $(NAME)/full:$(VERSION) .
28+
cd ./NodeFirefox && docker build -t $(NAME)/node-firefox:$(VERSION) .
4229

4330
tag_latest:
4431
docker tag $(NAME)/base:$(VERSION) $(NAME)/base:latest
4532
docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:latest
4633
docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:latest
4734
docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:latest
4835
docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:latest
49-
docker tag $(NAME)/full:$(VERSION) $(NAME)/full:latest
5036

5137
release: tag_latest
5238
@if ! docker images $(NAME)/base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
5339
@if ! docker images $(NAME)/hub | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/hub version $(VERSION) is not yet built. Please run 'make build'"; false; fi
5440
@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
5541
@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
5642
@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
57-
@if ! docker images $(NAME)/full | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/full version $(VERSION) is not yet built. Please run 'make build'"; false; fi
5843
docker push $(NAME)/base
5944
docker push $(NAME)/hub
6045
docker push $(NAME)/node-base
6146
docker push $(NAME)/node-chrome
6247
docker push $(NAME)/node-firefox
63-
docker push $(NAME)/full
6448
@echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)"
6549

6650
clean:

NodeFirefox/Dockerfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM selenium/node-base:2.44.0
2+
MAINTAINER Selenium <[email protected]>
3+
4+
USER root
5+
6+
#=========
7+
# Firefox
8+
#=========
9+
RUN apt-get update -qqy \
10+
&& apt-get -qqy --no-install-recommends install \
11+
firefox \
12+
&& rm -rf /var/lib/apt/lists/*
13+
14+
#========================
15+
# Selenium Configuration
16+
#========================
17+
COPY config.json /opt/selenium/config.json
18+
19+
USER seluser
File renamed without changes.

build/Dockerfile

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

build/firefox/install.sh

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

build/full/config.json

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

build/full/etc/service/sel-hub-emulator/run

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

build/full/install.sh

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

build/install.sh

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

0 commit comments

Comments
 (0)