cleanup template generation

rubytester · rubytester · commit 5135b9bd2543 · 2015-06-10T10:56:30.000-05:00
- rename Dockerfile.txt makes explicit this is template folder
  prevents accidental docker build on this folder

- remove template text from polluting final Dockerfile

- add missing MAINTAINER field

- generate_all convenience to update Dockerfiles without running docker build
diff --git a/Makefile b/Makefile
@@ -4,6 +4,18 @@ PLATFORM := $(shell uname -s)
 
 all: hub chrome firefox chromedebug firefoxdebug standalone_chrome standalone_firefox standalone_debug_chrome standalone_debug_firefox
 
+generate_all:	\
+	generate_hub \
+	generate_nodebase \
+	generate_chrome \
+	generate_firefox \
+	generate_chromedebug \
+	generate_firefoxdebug \
+	generate_standalone_firefox \
+	generate_standalone_chrome \
+	generate_standalone_debug_firefox \
+	generate_standalone_debug_chrome
+
 build: all
 
 ci: build test
@@ -118,6 +130,11 @@ test:
 	ci \
 	firefox \
 	firefoxdebug \
+	generate_all \
+	generate_hub \
+	generate_nodebase \
+	generate_chrome \
+	generate_firefox \
 	generate_chromedebug \
 	generate_firefoxdebug \
 	generate_standalone_chrome \
diff --git a/NodeChromeDebug/Dockerfile b/NodeChromeDebug/Dockerfile
@@ -1,5 +1,4 @@
 FROM selenium/node-chrome:2.46.0
-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/NodeDebug/Dockerfile.txt b/NodeDebug/Dockerfile.txt
@@ -1,4 +1,3 @@
-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/NodeDebug/README.md b/NodeDebug/README.md
@@ -1,3 +1,3 @@
 # Debug image template
 
-This folder is not meant to be build directly from the `docker build .` It only stands as a template for creating debug images derived from Selenium Node Browser images. Note usage in the Makefile at the root of this repo.
+This folder serves as a template for creating debug images derived from Selenium Node Browser images. Note usage in the Makefile at the root of this repo.
diff --git a/NodeDebug/generate.sh b/NodeDebug/generate.sh
@@ -8,7 +8,7 @@ rm -rf $FOLDER
 mkdir -p $FOLDER
 
 echo FROM selenium/$BASE:$VERSION > $FOLDER/Dockerfile
-cat ./Dockerfile >> $FOLDER/Dockerfile
+cat ./Dockerfile.txt >> $FOLDER/Dockerfile
 
 cat ../NodeBase/entry_point.sh \
   | sed 's/^xvfb-run/sudo -E -i -u seluser \\\
diff --git a/NodeFirefoxDebug/Dockerfile b/NodeFirefoxDebug/Dockerfile
@@ -1,5 +1,4 @@
 FROM selenium/node-firefox:2.46.0
-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/Standalone/Dockerfile.txt b/Standalone/Dockerfile.txt
@@ -1,4 +1,4 @@
-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
+MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
 
diff --git a/Standalone/README.md b/Standalone/README.md
@@ -1,3 +1,3 @@
 # Debug image template
 
-This folder is not meant to be build directly from the `docker build .` It only stands as a template for creating standalone server images derived from Selenium Node Browser images. Note usage in the Makefile at the root of this repo.
+This folder servers as a template for creating standalone server images derived from Selenium Node Browser images. Note usage in the Makefile at the root of this repo.
diff --git a/Standalone/generate.sh b/Standalone/generate.sh
@@ -8,7 +8,7 @@ rm -rf $FOLDER
 mkdir -p $FOLDER
 
 echo FROM selenium/$BASE:$VERSION > $FOLDER/Dockerfile
-cat ./Dockerfile >> $FOLDER/Dockerfile
+cat ./Dockerfile.txt >> $FOLDER/Dockerfile
 
 cp ./entry_point.sh $FOLDER
 
diff --git a/StandaloneChrome/Dockerfile b/StandaloneChrome/Dockerfile
@@ -1,5 +1,5 @@
 FROM selenium/node-chrome:2.46.0
-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
+MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
 
diff --git a/StandaloneDebug/README.md b/StandaloneDebug/README.md
@@ -1,3 +1,3 @@
 # Debug image template
 
-This folder is not meant to be build directly from the `docker build .` It only stands as a template for creating standalone server debug images. Note usage in the Makefile at the root of this repo.
+This folder serves as a template for creating standalone server debug images. Note usage in the Makefile at the root of this repo.
diff --git a/StandaloneDebug/generate.sh b/StandaloneDebug/generate.sh
@@ -8,7 +8,7 @@ rm -rf $FOLDER
 mkdir -p $FOLDER
 
 echo FROM selenium/$BASE:$VERSION > $FOLDER/Dockerfile
-cat ../NodeDebug/Dockerfile >> $FOLDER/Dockerfile
+cat ../NodeDebug/Dockerfile.txt >> $FOLDER/Dockerfile
 
 cp ./entry_point.sh $FOLDER
 
diff --git a/StandaloneDebugChrome/Dockerfile b/StandaloneDebugChrome/Dockerfile
@@ -1,5 +1,4 @@
 FROM selenium/standalone-chrome:2.46.0
-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/StandaloneDebugFirefox/Dockerfile b/StandaloneDebugFirefox/Dockerfile
@@ -1,5 +1,4 @@
 FROM selenium/standalone-firefox:2.46.0
-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile
@@ -1,5 +1,5 @@
 FROM selenium/node-firefox:2.46.0
-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
+MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM selenium/node-chrome:2.46.0`
`2`		`-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh`
`3`	`2`	`MAINTAINER Selenium <[email protected]>`
`4`	`3`
`5`	`4`	`USER root`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh`
`2`	`1`	`MAINTAINER Selenium <[email protected]>`
`3`	`2`
`4`	`3`	`USER root`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`# Debug image template`
`2`	`2`
`3`		-This folder is not meant to be build directly from the `docker build .` It only stands as a template for creating debug images derived from Selenium Node Browser images. Note usage in the Makefile at the root of this repo.
	`3`	`+This folder serves as a template for creating debug images derived from Selenium Node Browser images. Note usage in the Makefile at the root of this repo.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM selenium/node-firefox:2.46.0`
`2`		`-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh`
`3`	`2`	`MAINTAINER Selenium <[email protected]>`
`4`	`3`
`5`	`4`	`USER root`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh`
	`1`	`+MAINTAINER Selenium <selenium[email protected]>`
`2`	`2`
`3`	`3`	`USER root`
`4`	`4`
-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 FROM selenium/node-chrome:2.46.0
 -#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh
 +MAINTAINER Selenium <selenium[email protected]>
 USER root
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM selenium/standalone-chrome:2.46.0`
`2`		`-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh`
`3`	`2`	`MAINTAINER Selenium <[email protected]>`
`4`	`3`
`5`	`4`	`USER root`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM selenium/standalone-firefox:2.46.0`
`2`		`-#FROM selenium/node-*:2.46.0 Proper FROM attr will be applied throuh generate.sh`
`3`	`2`	`MAINTAINER Selenium <[email protected]>`
`4`	`3`
`5`	`4`	`USER root`