Skip to content

Commit e4374aa

Browse files
camiller2camiller2
committed
16 Updated generate to take namespace as argument. Added selenium version args WIP on firefox-: 46: 46: Updated makefile, generate.sh scripts, and Dockerfile.txt so that maintianer is supplied in one place. Updated config to be 2x compatible. Updated Makefile with new name of fl-selenium Updated generate to take namespace as argument. Changed firefox version to 46.0.1 and selenium version to 2.53.1 3 hours ago Added selenium version args updated usage example 12 hours ago Some fixes...sort of working Finished build scripts (for now) Improved build.sh Added build script Added selenium version args yesterday Merge pull request SeleniumHQ#394 from wheleph/master 2 days ago edit dockerfiletxt for SeleniumHQ#386 Merge pull request SeleniumHQ#386 from a-k-g/add-dbus-to-etc-environment update to selenium v3.1.0 4 days ago Add comment about time units used in environment variables 6 days ago Set proper GRID TIMEOUT value Add DBUS_SESSION_BUS_ADDRESS to /etc/environment (Fixes SeleniumHQ#358) a week ago update chromedriver/geckodriver. closes SeleniumHQ#384 Updated ChromeDriver to latest (2017-02-06; v2.27) Merge pull request SeleniumHQ#377 from alexgibson/firefox-51 2 weeks ago Update NodeFirefox to use 51.0.1 Merge pull request SeleniumHQ#374 from ryneeverett/tighten-readme Fix heading hierarchy consistency. Delete unnecessary code blocks. Merge branch 'master' of github.com:seleniumhq/docker-selenium 3 weeks ago add TZ to Base image to propegate to all. default timezone to UTC rather than US/Pacific. closes SeleniumHQ#70; fermium release Merge pull request SeleniumHQ#366 from atlassian/geckodriver-v0.13.0 erbium release ignore iml files Upgrade to firefox 50.1.0, geckodriver v0.13.0 Updated makefile, generate.sh scripts, and Dockerfile.txt so that maintianer is supplied in one place.
1 parent ade724e commit e4374aa

File tree

16 files changed

+33
-24
lines changed

16 files changed

+33
-24
lines changed

‎Hub/Dockerfile.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
MAINTAINER Selenium <[email protected]>
2-
31
#========================
42
# Selenium Configuration
53
#========================

‎Hub/generate.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#!/bin/bash
22
VERSION=$1
33
NAMESPACE=$2
4+
MAINTAINER=$3
45

56
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
67
echo "# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED." >> ./Dockerfile
78
echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
89
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
910
echo FROM $NAMESPACE/base:$VERSION >> ./Dockerfile
11+
echo MAINTAINER $MAINTAINER >> ./Dockerfile
12+
echo "" >> ./Dockerfile
1013
cat ./Dockerfile.txt >> ./Dockerfile

‎Makefile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
NAME := selenium
2+
MAINTAINER := "Selenium <[email protected]>"
23
VERSION := $(or $(VERSION),$(VERSION),3.1.0-astatine)
34
PLATFORM := $(shell uname -s)
45
BUILD_ARGS := $(BUILD_ARGS)
@@ -28,61 +29,61 @@ base:
2829
cd ./Base && docker build $(BUILD_ARGS) -t $(NAME)/base:$(VERSION) .
2930

3031
generate_hub:
31-
cd ./Hub && ./generate.sh $(VERSION) $(NAME)
32+
cd ./Hub && ./generate.sh $(VERSION) $(NAME) $(MAINTAINER)
3233

3334
hub: base generate_hub
3435
cd ./Hub && docker build $(BUILD_ARGS) -t $(NAME)/hub:$(VERSION) .
3536

3637
generate_nodebase:
37-
cd ./NodeBase && ./generate.sh $(VERSION) $(NAME)
38+
cd ./NodeBase && ./generate.sh $(VERSION) $(NAME) $(MAINTAINER)
3839

3940
nodebase: base generate_nodebase
4041
cd ./NodeBase && docker build $(BUILD_ARGS) -t $(NAME)/node-base:$(VERSION) .
4142

4243
generate_chrome:
43-
cd ./NodeChrome && ./generate.sh $(VERSION) $(NAME)
44+
cd ./NodeChrome && ./generate.sh $(VERSION) $(NAME) $(MAINTAINER)
4445

4546
chrome: nodebase generate_chrome
4647
cd ./NodeChrome && docker build $(BUILD_ARGS) -t $(NAME)/node-chrome:$(VERSION) .
4748

4849
generate_firefox:
49-
cd ./NodeFirefox && ./generate.sh $(VERSION) $(NAME)
50+
cd ./NodeFirefox && ./generate.sh $(VERSION) $(NAME) $(MAINTAINER)
5051

5152
firefox: nodebase generate_firefox
5253
cd ./NodeFirefox && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox:$(VERSION) .
5354

5455
generate_standalone_firefox:
55-
cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION) $(NAME)
56+
cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION) $(NAME) $(MAINTAINER)
5657

5758
standalone_firefox: generate_standalone_firefox firefox
5859
cd ./StandaloneFirefox && docker build $(BUILD_ARGS) -t $(NAME)/standalone-firefox:$(VERSION) .
5960

6061
generate_standalone_firefox_debug:
61-
cd ./StandaloneDebug && ./generate.sh StandaloneFirefoxDebug standalone-firefox Firefox $(VERSION) $(NAME)
62+
cd ./StandaloneDebug && ./generate.sh StandaloneFirefoxDebug standalone-firefox Firefox $(VERSION) $(NAME) $(MAINTAINER)
6263

6364
standalone_firefox_debug: generate_standalone_firefox_debug standalone_firefox
6465
cd ./StandaloneFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/standalone-firefox-debug:$(VERSION) .
6566

6667
generate_standalone_chrome:
67-
cd ./Standalone && ./generate.sh StandaloneChrome node-chrome Chrome $(VERSION) $(NAME)
68+
cd ./Standalone && ./generate.sh StandaloneChrome node-chrome Chrome $(VERSION) $(NAME) $(MAINTAINER)
6869

6970
standalone_chrome: generate_standalone_chrome chrome
7071
cd ./StandaloneChrome && docker build $(BUILD_ARGS) -t $(NAME)/standalone-chrome:$(VERSION) .
7172

7273
generate_standalone_chrome_debug:
73-
cd ./StandaloneDebug && ./generate.sh StandaloneChromeDebug standalone-chrome Chrome $(VERSION) $(NAME)
74+
cd ./StandaloneDebug && ./generate.sh StandaloneChromeDebug standalone-chrome Chrome $(VERSION) $(NAME) $(MAINTAINER)
7475

7576
standalone_chrome_debug: generate_standalone_chrome_debug standalone_chrome
7677
cd ./StandaloneChromeDebug && docker build $(BUILD_ARGS) -t $(NAME)/standalone-chrome-debug:$(VERSION) .
7778

7879
generate_chrome_debug:
79-
cd ./NodeDebug && ./generate.sh NodeChromeDebug node-chrome Chrome $(VERSION) $(NAME)
80+
cd ./NodeDebug && ./generate.sh NodeChromeDebug node-chrome Chrome $(VERSION) $(NAME) $(MAINTAINER)
8081

8182
chrome_debug: generate_chrome_debug chrome
8283
cd ./NodeChromeDebug && docker build $(BUILD_ARGS) -t $(NAME)/node-chrome-debug:$(VERSION) .
8384

8485
generate_firefox_debug:
85-
cd ./NodeDebug && ./generate.sh NodeFirefoxDebug node-firefox Firefox $(VERSION) $(NAME)
86+
cd ./NodeDebug && ./generate.sh NodeFirefoxDebug node-firefox Firefox $(VERSION) $(NAME) $(MAINTAINER)
8687

8788
firefox_debug: generate_firefox_debug firefox
8889
cd ./NodeFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox-debug:$(VERSION) .

‎NodeBase/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
55
FROM selenium/base:3.1.0-astatine
66
MAINTAINER Selenium <[email protected]>
7-
87
ENV DEBIAN_FRONTEND noninteractive
98
ENV DEBCONF_NONINTERACTIVE_SEEN true
109

‎NodeBase/Dockerfile.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
MAINTAINER Selenium <[email protected]>
2-
31
ENV DEBIAN_FRONTEND noninteractive
42
ENV DEBCONF_NONINTERACTIVE_SEEN true
53

‎NodeBase/generate.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#!/bin/bash
22
VERSION=$1
33
NAMESPACE=$2
4+
MAINTAINER=$3
45

56
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
67
echo "# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED." >> ./Dockerfile
78
echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
89
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
910
echo FROM $NAMESPACE/base:$VERSION >> ./Dockerfile
11+
echo MAINTAINER $MAINTAINER >> ./Dockerfile
12+
echo "" >> ./Dockerfile
1013
cat ./Dockerfile.txt >> ./Dockerfile

‎NodeChrome/Dockerfile.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
MAINTAINER Selenium <[email protected]>
2-
31
USER root
42

53
#============================================

‎NodeChrome/generate.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#!/bin/bash
22
VERSION=$1
33
NAMESPACE=$2
4+
MAINTAINER=$3
45

56
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
67
echo "# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED." >> ./Dockerfile
78
echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
89
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
910
echo FROM $NAMESPACE/node-base:$VERSION >> ./Dockerfile
11+
echo MAINTAINER $MAINTAINER >> ./Dockerfile
12+
echo "" >> ./Dockerfile
1013
cat ./Dockerfile.txt >> ./Dockerfile

‎NodeDebug/Dockerfile.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
MAINTAINER Selenium <[email protected]>
2-
31
USER root
42

53
#=====

‎NodeDebug/generate.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ BASE=$2
44
BROWSER=$3
55
VERSION=$4
66
NAMESPACE=$5
7+
MAINTAINER=$6
78

89
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > $FOLDER/Dockerfile
910
echo "# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED." >> $FOLDER/Dockerfile
1011
echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> $FOLDER/Dockerfile
1112
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> $FOLDER/Dockerfile
1213
echo FROM $NAMESPACE/$BASE:$VERSION >> $FOLDER/Dockerfile
14+
echo MAINTAINER $MAINTAINER >> ./Dockerfile
15+
echo "" >> ./Dockerfile
1316
cat ./Dockerfile.txt >> $FOLDER/Dockerfile
1417

1518
cat ../NodeBase/entry_point.sh \

0 commit comments

Comments
 (0)