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.

camiller2 · camiller2 · commit e4374aa484fe · 2017-02-23T13:37:18.000-05:00
diff --git a/Hub/Dockerfile.txt b/Hub/Dockerfile.txt
@@ -1,5 +1,3 @@
-MAINTAINER Selenium <selenium-developers@googlegroups.com>
-
 #========================
 # Selenium Configuration
 #========================
diff --git a/Hub/generate.sh b/Hub/generate.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 VERSION=$1
 NAMESPACE=$2
+MAINTAINER=$3
 
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
 echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
 echo FROM $NAMESPACE/base:$VERSION >> ./Dockerfile
+echo MAINTAINER $MAINTAINER >> ./Dockerfile 
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> ./Dockerfile
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 NAME := selenium
+MAINTAINER := "Selenium <selenium-developers@googlegroups.com>"
 VERSION := $(or $(VERSION),$(VERSION),3.1.0-astatine)
 PLATFORM := $(shell uname -s)
 BUILD_ARGS := $(BUILD_ARGS)
@@ -28,61 +29,61 @@ base:
 	cd ./Base && docker build $(BUILD_ARGS) -t $(NAME)/base:$(VERSION) .
 
 generate_hub:
-	cd ./Hub && ./generate.sh $(VERSION) $(NAME)
+	cd ./Hub && ./generate.sh $(VERSION) $(NAME) $(MAINTAINER)
 
 hub: base generate_hub
 	cd ./Hub && docker build $(BUILD_ARGS) -t $(NAME)/hub:$(VERSION) .
 
 generate_nodebase:
-	cd ./NodeBase && ./generate.sh $(VERSION) $(NAME)
+	cd ./NodeBase && ./generate.sh $(VERSION) $(NAME) $(MAINTAINER)
 
 nodebase: base generate_nodebase
 	cd ./NodeBase && docker build $(BUILD_ARGS) -t $(NAME)/node-base:$(VERSION) .
 
 generate_chrome:
-	cd ./NodeChrome && ./generate.sh $(VERSION) $(NAME)
+	cd ./NodeChrome && ./generate.sh $(VERSION) $(NAME) $(MAINTAINER)
 
 chrome: nodebase generate_chrome
 	cd ./NodeChrome && docker build $(BUILD_ARGS) -t $(NAME)/node-chrome:$(VERSION) .
 
 generate_firefox:
-	cd ./NodeFirefox && ./generate.sh $(VERSION) $(NAME)
+	cd ./NodeFirefox && ./generate.sh $(VERSION) $(NAME) $(MAINTAINER)
 
 firefox: nodebase generate_firefox
 	cd ./NodeFirefox && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox:$(VERSION) .
 
 generate_standalone_firefox:
-	cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION) $(NAME)
+	cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION) $(NAME) $(MAINTAINER)
 
 standalone_firefox: generate_standalone_firefox firefox
 	cd ./StandaloneFirefox && docker build $(BUILD_ARGS) -t $(NAME)/standalone-firefox:$(VERSION) .
 
 generate_standalone_firefox_debug:
-	cd ./StandaloneDebug && ./generate.sh StandaloneFirefoxDebug standalone-firefox Firefox $(VERSION) $(NAME)
+	cd ./StandaloneDebug && ./generate.sh StandaloneFirefoxDebug standalone-firefox Firefox $(VERSION) $(NAME) $(MAINTAINER)
 
 standalone_firefox_debug: generate_standalone_firefox_debug standalone_firefox
 	cd ./StandaloneFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/standalone-firefox-debug:$(VERSION) .
 
 generate_standalone_chrome:
-	cd ./Standalone && ./generate.sh StandaloneChrome node-chrome Chrome $(VERSION) $(NAME)
+	cd ./Standalone && ./generate.sh StandaloneChrome node-chrome Chrome $(VERSION) $(NAME) $(MAINTAINER)
 
 standalone_chrome: generate_standalone_chrome chrome
 	cd ./StandaloneChrome && docker build $(BUILD_ARGS) -t $(NAME)/standalone-chrome:$(VERSION) .
 
 generate_standalone_chrome_debug:
-	cd ./StandaloneDebug && ./generate.sh StandaloneChromeDebug standalone-chrome Chrome $(VERSION) $(NAME)
+	cd ./StandaloneDebug && ./generate.sh StandaloneChromeDebug standalone-chrome Chrome $(VERSION) $(NAME) $(MAINTAINER)
 
 standalone_chrome_debug: generate_standalone_chrome_debug standalone_chrome
 	cd ./StandaloneChromeDebug && docker build $(BUILD_ARGS) -t $(NAME)/standalone-chrome-debug:$(VERSION) .
 
 generate_chrome_debug:
-	cd ./NodeDebug && ./generate.sh NodeChromeDebug node-chrome Chrome $(VERSION) $(NAME)
+	cd ./NodeDebug && ./generate.sh NodeChromeDebug node-chrome Chrome $(VERSION) $(NAME) $(MAINTAINER)
 
 chrome_debug: generate_chrome_debug chrome
 	cd ./NodeChromeDebug && docker build $(BUILD_ARGS) -t $(NAME)/node-chrome-debug:$(VERSION) .
 
 generate_firefox_debug:
-	cd ./NodeDebug && ./generate.sh NodeFirefoxDebug node-firefox Firefox $(VERSION) $(NAME)
+	cd ./NodeDebug && ./generate.sh NodeFirefoxDebug node-firefox Firefox $(VERSION) $(NAME) $(MAINTAINER)
 
 firefox_debug: generate_firefox_debug firefox
 	cd ./NodeFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox-debug:$(VERSION) .
diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
@@ -4,7 +4,6 @@
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/base:3.1.0-astatine
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
 
diff --git a/NodeBase/Dockerfile.txt b/NodeBase/Dockerfile.txt
@@ -1,5 +1,3 @@
-MAINTAINER Selenium <selenium-developers@googlegroups.com>
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
 
diff --git a/NodeBase/generate.sh b/NodeBase/generate.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 VERSION=$1
 NAMESPACE=$2
+MAINTAINER=$3
 
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
 echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
 echo FROM $NAMESPACE/base:$VERSION >> ./Dockerfile
+echo MAINTAINER $MAINTAINER >> ./Dockerfile 
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> ./Dockerfile
diff --git a/NodeChrome/Dockerfile.txt b/NodeChrome/Dockerfile.txt
@@ -1,5 +1,3 @@
-MAINTAINER Selenium <selenium-developers@googlegroups.com>
-
 USER root
 
 #============================================
diff --git a/NodeChrome/generate.sh b/NodeChrome/generate.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 VERSION=$1
 NAMESPACE=$2
+MAINTAINER=$3
 
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
 echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
 echo FROM $NAMESPACE/node-base:$VERSION >> ./Dockerfile
+echo MAINTAINER $MAINTAINER >> ./Dockerfile 
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> ./Dockerfile
diff --git a/NodeDebug/Dockerfile.txt b/NodeDebug/Dockerfile.txt
@@ -1,5 +1,3 @@
-MAINTAINER Selenium <selenium-developers@googlegroups.com>
-
 USER root
 
 #=====
diff --git a/NodeDebug/generate.sh b/NodeDebug/generate.sh
@@ -4,12 +4,15 @@ BASE=$2
 BROWSER=$3
 VERSION=$4
 NAMESPACE=$5
+MAINTAINER=$6
 
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > $FOLDER/Dockerfile
 echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> $FOLDER/Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> $FOLDER/Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> $FOLDER/Dockerfile
 echo FROM $NAMESPACE/$BASE:$VERSION >> $FOLDER/Dockerfile
+echo MAINTAINER $MAINTAINER >> ./Dockerfile 
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> $FOLDER/Dockerfile
 
 cat ../NodeBase/entry_point.sh \
diff --git a/NodeFirefox/Dockerfile.txt b/NodeFirefox/Dockerfile.txt
@@ -1,5 +1,3 @@
-MAINTAINER Selenium <selenium-developers@googlegroups.com>
-
 USER root
 
 #=========
diff --git a/NodeFirefox/generate.sh b/NodeFirefox/generate.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 VERSION=$1
 NAMESPACE=$2
+MAINTAINER=$3
 
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
 echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
 echo FROM $NAMESPACE/node-base:$VERSION >> ./Dockerfile
+echo MAINTAINER $MAINTAINER >> ./Dockerfile 
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> ./Dockerfile
diff --git a/NodeFirefoxDebug/Dockerfile.txt b/NodeFirefoxDebug/Dockerfile.txt
@@ -1,4 +1,4 @@
-FROM selenium/node-firefox:3.0.1-germanium
+FROM fl-selenium/node-firefox:3.0.1-germanium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/Standalone/Dockerfile.txt b/Standalone/Dockerfile.txt
@@ -1,5 +1,3 @@
-MAINTAINER Selenium <selenium-developers@googlegroups.com>
-
 USER root
 
 #====================================
diff --git a/Standalone/generate.sh b/Standalone/generate.sh
@@ -4,12 +4,15 @@ BASE=$2
 BROWSER=$3
 VERSION=$4
 NAMESPACE=$5
+MAINTAINER=$6
 
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > $FOLDER/Dockerfile
 echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> $FOLDER/Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> $FOLDER/Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> $FOLDER/Dockerfile
 echo FROM $NAMESPACE/$BASE:$VERSION >> $FOLDER/Dockerfile
+echo MAINTAINER $MAINTAINER >> ./Dockerfile 
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> $FOLDER/Dockerfile
 
 cp ./entry_point.sh $FOLDER
diff --git a/StandaloneDebug/generate.sh b/StandaloneDebug/generate.sh
@@ -4,12 +4,15 @@ BASE=$2
 BROWSER=$3
 VERSION=$4
 NAMESPACE=$5
+MAINTAINER=$6
 
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > $FOLDER/Dockerfile
 echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> $FOLDER/Dockerfile
 echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> $FOLDER/Dockerfile
 echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> $FOLDER/Dockerfile
 echo FROM $NAMESPACE/$BASE:$VERSION >> $FOLDER/Dockerfile
+echo MAINTAINER $MAINTAINER >> ./Dockerfile 
+echo "" >> ./Dockerfile
 cat ../NodeDebug/Dockerfile.txt >> $FOLDER/Dockerfile
 
 cp ./entry_point.sh $FOLDER

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-MAINTAINER Selenium <[email protected]>`
`2`		`-`
`3`	`1`	`#========================`
`4`	`2`	`# Selenium Configuration`
`5`	`3`	`#========================`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-MAINTAINER Selenium <[email protected]>`
`2`		`-`
`3`	`1`	`ENV DEBIAN_FRONTEND noninteractive`
`4`	`2`	`ENV DEBCONF_NONINTERACTIVE_SEEN true`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-MAINTAINER Selenium <[email protected]>`
`2`		`-`
`3`	`1`	`USER root`
`4`	`2`
`5`	`3`	`#============================================`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM selenium/node-firefox:3.0.1-germanium`
	`1`	`+FROM fl-selenium/node-firefox:3.0.1-germanium`
`2`	`2`	`MAINTAINER Selenium <[email protected]>`
`3`	`3`
`4`	`4`	`USER root`