Skip to content

Commit

Permalink
Change Maintainer entry to Selenium in Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
mtscout6 committed Nov 17, 2014
1 parent 5d92a12 commit 8d24332
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM phusion/baseimage:0.9.15
MAINTAINER Leo Gallucci <elgalu3@gmail.com>
MAINTAINER Selenium <selenium-developers@googlegroups.com>

#================================================
# Customize sources for apt-get
Expand Down
2 changes: 1 addition & 1 deletion Hub/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM elgalu/selenium-base:2.44.0
MAINTAINER Leo Gallucci <elgalu3@gmail.com>
MAINTAINER Selenium <selenium-developers@googlegroups.com>

#==========================================
# Scripts to run selenium hub as a service
Expand Down
50 changes: 25 additions & 25 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NAME := elgalu/selenium
NAME := selenium
VERSION := $(or $(VERSION),$(VERSION),'2.44.0')
PLATFORM := $(shell uname -s)

Expand All @@ -13,59 +13,59 @@ all: hub chrome firefox full
build: all clean

base:
cd ./Base && docker build -t $(NAME)-base:$(VERSION) .
cd ./Base && docker build -t $(NAME)/base:$(VERSION) .

hub: base
cd ./Hub && docker build -t $(NAME)-hub:$(VERSION) .
cd ./Hub && docker build -t $(NAME)/hub:$(VERSION) .

nodebase: base
cd ./NodeBase && docker build -t $(NAME)-node-base:$(VERSION) .
cd ./NodeBase && docker build -t $(NAME)/node-base:$(VERSION) .

chrome: nodebase
rm -rf chrome_image
mkdir -p chrome_image/build/chrome
cp build/Dockerfile chrome_image/Dockerfile
cp build/install.sh chrome_image/build/install.sh
cp $(COPYARGS) build/chrome chrome_image/build/
cd ./chrome_image && docker build -t $(NAME)-node-chrome:$(VERSION) .
cd ./chrome_image && 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) .
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 ./full_image && docker build -t $(NAME)/full:$(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
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
@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
2 changes: 1 addition & 1 deletion NodeBase/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM elgalu/selenium-base:2.44.0
MAINTAINER Leo Gallucci <elgalu3@gmail.com>
MAINTAINER Selenium <selenium-developers@googlegroups.com>

#=================
# Locale settings
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM elgalu/selenium-node-base:2.44.0
MAINTAINER Leo Gallucci <elgalu3@gmail.com>
MAINTAINER Selenium <selenium-developers@googlegroups.com>

COPY ./build /tmp/build
RUN chmod +x /tmp/build/install.sh \
Expand Down

0 comments on commit 8d24332

Please sign in to comment.