Skip to content

Commit

Permalink
Change Firefox Node to run Selenium Node Directly
Browse files Browse the repository at this point in the history
Remove init script for running Selenium node in favor of running the jar
directly.

Part of #3
  • Loading branch information
mtscout6 committed Nov 18, 2014
1 parent db20142 commit d93ff04
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 98 deletions.
18 changes: 1 addition & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,42 +25,26 @@ chrome: nodebase
cd ./NodeChrome && docker build -t $(NAME)/node-chrome:$(VERSION) .

firefox: nodebase
rm -rf firefox_image
mkdir -p firefox_image/build/firefox
cp build/Dockerfile firefox_image/Dockerfile
cp build/install.sh firefox_image/build/install.sh
cp $(COPYARGS) build/firefox firefox_image/build/
cd ./firefox_image && docker build -t $(NAME)/node-firefox:$(VERSION) .

full: nodebase
rm -rf full_image
mkdir -p full_image/build/
cp build/Dockerfile full_image/Dockerfile
cp $(COPYARGS) build/ full_image/build/
cp $(COPYARGS) Hub/etc/ full_image/build/full/etc/
cd ./full_image && docker build -t $(NAME)/full:$(VERSION) .
cd ./NodeFirefox && docker build -t $(NAME)/node-firefox:$(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)/full:$(VERSION) $(NAME)/full:latest

release: tag_latest
@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
@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
@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)/full | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/full version $(VERSION) is not yet built. Please run 'make build'"; false; fi
docker push $(NAME)/base
docker push $(NAME)/hub
docker push $(NAME)/node-base
docker push $(NAME)/node-chrome
docker push $(NAME)/node-firefox
docker push $(NAME)/full
@echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)"

clean:
Expand Down
19 changes: 19 additions & 0 deletions NodeFirefox/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM selenium/node-base:2.44.0
MAINTAINER Selenium <[email protected]>

USER root

#=========
# Firefox
#=========
RUN apt-get update -qqy \
&& apt-get -qqy --no-install-recommends install \
firefox \
&& rm -rf /var/lib/apt/lists/*

#========================
# Selenium Configuration
#========================
COPY config.json /opt/selenium/config.json

USER seluser
File renamed without changes.
7 changes: 0 additions & 7 deletions build/Dockerfile

This file was deleted.

14 changes: 0 additions & 14 deletions build/firefox/install.sh

This file was deleted.

31 changes: 0 additions & 31 deletions build/full/config.json

This file was deleted.

5 changes: 0 additions & 5 deletions build/full/etc/service/sel-hub-emulator/run

This file was deleted.

10 changes: 0 additions & 10 deletions build/full/install.sh

This file was deleted.

14 changes: 0 additions & 14 deletions build/install.sh

This file was deleted.

0 comments on commit d93ff04

Please sign in to comment.