removing blank lines per default and added keep-blank-lines option

Author: webner

README.md

@@ -77,7 +77,7 @@ $ docker run -d --name nginx-gen --volumes-from nginx \
 ### Usage
 ```
 $ docker-gen
-Usage: docker-gen [-config file] [-watch=false] [-notify="restart xyz"] [-notify-sighup="nginx-proxy"] [-interval=0] [-endpoint tcp|unix://..] [-tlsverify] [-tlscert file] [-tlskey file] [-tlscacert file] [-skip-blank-lines] <template> [<dest>]
+Usage: docker-gen [-config file] [-watch=false] [-notify="restart xyz"] [-notify-sighup="nginx-proxy"] [-interval=0] [-endpoint tcp|unix://..] [-tlsverify] [-tlscert file] [-tlskey file] [-tlscacert file] [-keep-blank-lines] <template> [<dest>]
 ```
 
 *Options:*
@@ -92,7 +92,7 @@ Usage: docker-gen [-config file] [-watch=false] [-notify="restart xyz"] [-notify
   -notify-sighup="": send HUP signal to container.  Equivalent to `docker kill -s HUP container-ID`
   -only-exposed=false: only include containers with exposed ports
   -only-published=false: only include containers with published ports (implies -only-exposed)
-  -skip-blank-lines=false: skip blank lines in output file
+  -keep-blank-lines=false: keep blank lines in the output file
   -tlscacert="": path to TLS CA certificate file
   -tlscert="": path to TLS client certificate file
   -tlskey="": path to TLS client key file

docker-gen.go

@@ -29,7 +29,7 @@ var (
 	configFiles             stringslice
 	configs                 ConfigFile
 	interval                int
-	skipBlankLines          bool
+	keepBlankLines          bool
 	endpoint                string
 	tlsCert                 string
 	tlsKey                  string
@@ -115,7 +115,7 @@ type Config struct {
 	OnlyExposed      bool
 	OnlyPublished    bool
 	Interval         int
-	SkipBlankLines   bool
+	KeepBlankLines   bool
 }
 
 type ConfigFile struct {
@@ -393,7 +393,7 @@ func initFlags() {
 		"send HUP signal to container.  Equivalent to `docker kill -s HUP container-ID`")
 	flag.Var(&configFiles, "config", "config files with template directives. Config files will be merged if this option is specified multiple times.")
 	flag.IntVar(&interval, "interval", 0, "notify command interval (secs)")
-	flag.BoolVar(&skipBlankLines, "skip-blank-lines", false, "skip blank lines in output file")
+	flag.BoolVar(&keepBlankLines, "keep-blank-lines", false, "keep blank lines in the output file")
 	flag.StringVar(&endpoint, "endpoint", "", "docker api endpoint (tcp|unix://..). Default unix:///var/run/docker.sock")
 	flag.StringVar(&tlsCert, "tlscert", filepath.Join(certPath, "cert.pem"), "path to TLS client certificate file")
 	flag.StringVar(&tlsKey, "tlskey", filepath.Join(certPath, "key.pem"), "path to TLS client key file")
@@ -434,7 +434,7 @@ func main() {
 			OnlyExposed:      onlyExposed,
 			OnlyPublished:    onlyPublished,
 			Interval:         interval,
-			SkipBlankLines:   skipBlankLines,
+			KeepBlankLines:   keepBlankLines,
 		}
 		if notifySigHUPContainerID != "" {
 			config.NotifyContainers[notifySigHUPContainerID] = docker.SIGHUP

template.go

@@ -382,7 +382,7 @@ func generateFile(config Config, containers Context) bool {
 
 	contents := executeTemplate(config.Template, filteredContainers)
 
-	if config.SkipBlankLines {
+	if !config.KeepBlankLines {
 		contents = removeBlankLines(contents)
 	}