generic namespacing (allow others to easily customize image names)

Base/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:16.04
-MAINTAINER Selenium <[email protected]>
+LABEL authors="Selenium <[email protected]>"
 
 #================================================
 # Customize sources for apt-get

Hub/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/base:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 #========================
 # Selenium Configuration

Hub/Dockerfile.txt

@@ -1,5 +1,3 @@
-MAINTAINER Selenium <[email protected]>
-
 #========================
 # Selenium Configuration
 #========================

Hub/generate.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 VERSION=$1
+NAMESPACE=$2
+AUTHORS=$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 selenium/base:$VERSION >> ./Dockerfile
+echo FROM $NAMESPACE/base:$VERSION >> ./Dockerfile
+echo LABEL authors="$AUTHORS" >> ./Dockerfile
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> ./Dockerfile

Makefile

@@ -1,5 +1,7 @@
 NAME := selenium
 VERSION := $(or $(VERSION),$(VERSION),3.4.0-bismuth)
+NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
+AUTHORS := $(or $(AUTHORS),$(AUTHORS),SeleniumHQ)
 PLATFORM := $(shell uname -s)
 BUILD_ARGS := $(BUILD_ARGS)
 MAJOR := $(word 1,$(subst ., ,$(VERSION)))
@@ -29,67 +31,67 @@ base:
 	cd ./Base && docker build $(BUILD_ARGS) -t $(NAME)/base:$(VERSION) .
 
 generate_hub:
-	cd ./Hub && ./generate.sh $(VERSION)
+	cd ./Hub && ./generate.sh $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 hub: base generate_hub
 	cd ./Hub && docker build $(BUILD_ARGS) -t $(NAME)/hub:$(VERSION) .
 
 generate_nodebase:
-	cd ./NodeBase && ./generate.sh $(VERSION)
+	cd ./NodeBase && ./generate.sh $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 nodebase: base generate_nodebase
 	cd ./NodeBase && docker build $(BUILD_ARGS) -t $(NAME)/node-base:$(VERSION) .
 
 generate_chrome:
-	cd ./NodeChrome && ./generate.sh $(VERSION)
+	cd ./NodeChrome && ./generate.sh $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 chrome: nodebase generate_chrome
 	cd ./NodeChrome && docker build $(BUILD_ARGS) -t $(NAME)/node-chrome:$(VERSION) .
 
 generate_firefox:
-	cd ./NodeFirefox && ./generate.sh $(VERSION)
+	cd ./NodeFirefox && ./generate.sh $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 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)
+	cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox Firefox $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 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)
+	cd ./StandaloneDebug && ./generate.sh StandaloneFirefoxDebug standalone-firefox Firefox $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 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)
+	cd ./Standalone && ./generate.sh StandaloneChrome node-chrome Chrome $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 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)
+	cd ./StandaloneDebug && ./generate.sh StandaloneChromeDebug standalone-chrome Chrome $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 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)
+	cd ./NodeDebug && ./generate.sh NodeChromeDebug node-chrome Chrome $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 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)
+	cd ./NodeDebug && ./generate.sh NodeFirefoxDebug node-firefox Firefox $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 firefox_debug: generate_firefox_debug firefox
 	cd ./NodeFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox-debug:$(VERSION) .
 
 generate_phantomjs:
-	cd ./NodePhantomJS && ./generate.sh $(VERSION)
+	cd ./NodePhantomJS && ./generate.sh $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 phantomjs: nodebase generate_phantomjs
 	cd ./NodePhantomJS && docker build $(BUILD_ARGS) -t $(NAME)/node-phantomjs:$(VERSION) .

NodeBase/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/base:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
@@ -15,7 +15,6 @@ RUN apt-get update -qqy \
   && apt-get -qqy install \
     locales \
     xvfb \
-    dbus \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #==============================

NodeBase/Dockerfile.txt

@@ -1,5 +1,3 @@
-MAINTAINER Selenium <[email protected]>
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
 

NodeBase/generate.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 VERSION=$1
+NAMESPACE=$2
+AUTHORS=$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 selenium/base:$VERSION >> ./Dockerfile
+echo FROM $NAMESPACE/base:$VERSION >> ./Dockerfile
+echo LABEL authors="$AUTHORS" >> ./Dockerfile
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> ./Dockerfile

NodeChrome/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/node-base:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 USER root
 
@@ -62,15 +62,14 @@ COPY generate_config /opt/selenium/generate_config
 RUN chmod +x /opt/selenium/generate_config
 
 #=================================
-# Chrome Launch Script Modication
+# Chrome Launch Script Modification
 #=================================
 COPY chrome_launcher.sh /opt/google/chrome/google-chrome
 RUN chmod +x /opt/google/chrome/google-chrome
 
 RUN chown -R seluser:seluser /opt/selenium
 
-# Following line fixes
-# https://github.com/SeleniumHQ/docker-selenium/issues/87
-RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
+# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
+ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
 
-USER seluser
+USER seluser

NodeChrome/Dockerfile.txt

@@ -1,5 +1,3 @@
-MAINTAINER Selenium <[email protected]>
-
 USER root
 
 #============================================

NodeChrome/generate.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 VERSION=$1
+NAMESPACE=$2
+AUTHORS=$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 selenium/node-base:$VERSION >> ./Dockerfile
+echo FROM $NAMESPACE/node-base:$VERSION >> ./Dockerfile
+echo LABEL authors="$AUTHORS" >> ./Dockerfile
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> ./Dockerfile

NodeChromeDebug/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/node-chrome:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 USER root
 

NodeDebug/Dockerfile.txt

@@ -1,5 +1,3 @@
-MAINTAINER Selenium <[email protected]>
-
 USER root
 
 #=====

NodeDebug/generate.sh

@@ -3,12 +3,16 @@ FOLDER=../$1
 BASE=$2
 BROWSER=$3
 VERSION=$4
+NAMESPACE=$5
+AUTHORS=$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 selenium/$BASE:$VERSION >> $FOLDER/Dockerfile
+echo FROM $NAMESPACE/$BASE:$VERSION >> $FOLDER/Dockerfile
+echo LABEL authors="$AUTHORS" >> $FOLDER/Dockerfile
+echo "" >> $FOLDER/Dockerfile
 cat ./Dockerfile.txt >> $FOLDER/Dockerfile
 
 cat ./README.template.md \

NodeFirefox/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/node-base:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 USER root
 
@@ -58,8 +58,7 @@ COPY generate_config /opt/selenium/generate_config
 RUN chmod +x /opt/selenium/generate_config \
   && chown -R seluser:seluser /opt/selenium
 
-# Following line fixes
-# https://github.com/SeleniumHQ/docker-selenium/issues/87
-RUN echo "DBUS_SESSION_BUS_ADDRESS=/dev/null" >> /etc/environment
+# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
+ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
 
 USER seluser

NodeFirefox/Dockerfile.txt

@@ -1,5 +1,3 @@
-MAINTAINER Selenium <[email protected]>
-
 USER root
 
 #=========

NodeFirefox/generate.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 VERSION=$1
+NAMESPACE=$2
+AUTHORS=$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 selenium/node-base:$VERSION >> ./Dockerfile
+echo FROM $NAMESPACE/node-base:$VERSION >> ./Dockerfile
+echo LABEL authors="$AUTHORS" >> ./Dockerfile
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> ./Dockerfile

NodeFirefoxDebug/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/node-firefox:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 USER root
 

NodePhantomJS/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/node-base:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 USER root
 

NodePhantomJS/Dockerfile.txt

@@ -1,5 +1,3 @@
-MAINTAINER Selenium <[email protected]>
-
 USER root
 
 #==============

NodePhantomJS/generate.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 VERSION=$1
+NAMESPACE=$2
+AUTHORS=$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 selenium/node-base:$VERSION >> ./Dockerfile
+echo FROM $NAMESPACE/node-base:$VERSION >> ./Dockerfile
+echo LABEL authors="$AUTHORS" >> ./Dockerfile
+echo "" >> ./Dockerfile
 cat ./Dockerfile.txt >> ./Dockerfile

Standalone/Dockerfile.txt

@@ -1,5 +1,3 @@
-MAINTAINER Selenium <[email protected]>
-
 USER root
 
 #====================================

Standalone/generate.sh

@@ -3,12 +3,16 @@ FOLDER=../$1
 BASE=$2
 BROWSER=$3
 VERSION=$4
+NAMESPACE=$5
+AUTHORS=$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 selenium/$BASE:$VERSION >> $FOLDER/Dockerfile
+echo FROM $NAMESPACE/$BASE:$VERSION >> $FOLDER/Dockerfile
+echo LABEL authors="$AUTHORS" >> $FOLDER/Dockerfile
+echo "" >> $FOLDER/Dockerfile
 cat ./Dockerfile.txt >> $FOLDER/Dockerfile
 
 cp ./entry_point.sh $FOLDER

StandaloneChrome/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/node-chrome:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 USER root
 

StandaloneChromeDebug/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/standalone-chrome:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 USER root
 

StandaloneDebug/generate.sh

@@ -3,12 +3,16 @@ FOLDER=../$1
 BASE=$2
 BROWSER=$3
 VERSION=$4
+NAMESPACE=$5
+AUTHORS=$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 selenium/$BASE:$VERSION >> $FOLDER/Dockerfile
+echo FROM $NAMESPACE/$BASE:$VERSION >> $FOLDER/Dockerfile
+echo LABEL authors="$AUTHORS" >> $FOLDER/Dockerfile
+echo "" >> $FOLDER/Dockerfile
 cat ../NodeDebug/Dockerfile.txt >> $FOLDER/Dockerfile
 
 cp ./entry_point.sh $FOLDER

StandaloneFirefox/Dockerfile

@@ -3,7 +3,7 @@
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 FROM selenium/node-firefox:3.4.0-bismuth
-MAINTAINER Selenium <[email protected]>
+LABEL authors=SeleniumHQ
 
 USER root