docs: update README and CLI usage

Author: buchdag

README.md

@@ -87,67 +87,70 @@ Usage: docker-gen [options] template [dest]
 Generate files from docker container meta-data
 
 Options:
-  -config value
-      config files with template directives. Config files will be merged if this option is specified multiple times. (default [])
+  -config path
+      config files with template directives.
+      Config files will be merged if this option is specified multiple times. (default [])
+  -container-filter key=value
+      container filter for inclusion by docker-gen.
+      You can pass this option multiple times to combine filters with AND.
+      https://docs.docker.com/engine/reference/commandline/ps/#filter
   -endpoint string
       docker api endpoint (tcp|unix://..). Default unix:///var/run/docker.sock
+  -include-stopped
+      include stopped containers.
+      Bypassed when providing a container status filter (-container-filter status=foo).
   -interval int
       notify command interval (secs)
   -keep-blank-lines
       keep blank lines in the output file
   -notify restart xyz
       run command after template is regenerated (e.g restart xyz)
-  -notify-output
-      log the output(stdout/stderr) of notify command
-  -notify-sighup container-ID
-      send HUP signal to container.
-      Equivalent to 'docker kill -s HUP container-ID', or `-notify-container container-ID -notify-signal 1`.
-      You can pass this option multiple times to send HUP to multiple containers.
   -notify-container container-ID
       send -notify-signal signal (defaults to 1 / HUP) to container.
       You can pass this option multiple times to notify multiple containers.
   -notify-filter key=value
       container filter for notification (e.g -notify-filter name=foo).
       You can pass this option multiple times to combine filters with AND.
       https://docs.docker.com/engine/reference/commandline/ps/#filter
+  -notify-output
+      log the output(stdout/stderr) of notify command
+  -notify-sighup container-ID
+      send HUP signal to container.
+      Equivalent to 'docker kill -s HUP container-ID', or `-notify-container container-ID -notify-signal 1`.
+      You can pass this option multiple times to send HUP to multiple containers.
   -notify-signal signal
       signal to send to the -notify-container and -notify-filter. -1 to call docker restart. Defaults to 1 aka. HUP.
       All available signals available on the dockerclient
       https://github.com/fsouza/go-dockerclient/blob/main/signal.go
   -only-exposed
-      only include containers with exposed ports
+      only include containers with exposed ports.
+      Bypassed when using the exposed filter with (-container-filter exposed=foo).
   -only-published
-      only include containers with published ports (implies -only-exposed)
-  -include-stopped
-      include stopped containers
-  -container-filter
-      container filter for inclusion by docker-gen (e.g -container-filter status=running).
-      Using this option bypass the -include-stopped option and set it to true.
-      You can pass this option multiple times to combine filters with AND.
-      https://docs.docker.com/engine/reference/commandline/ps/#filter
+      only include containers with published ports (implies -only-exposed).
+      Bypassed when providing a container published filter (-container-filter published=foo).
   -tlscacert string
-      path to TLS CA certificate file (default "~/.docker/machine/machines/default/ca.pem")
+      path to TLS CA certificate file (default "~/.docker/ca.pem")
   -tlscert string
-      path to TLS client certificate file (default "~/.docker/machine/machines/default/cert.pem")
+      path to TLS client certificate file (default "~/.docker/cert.pem")
   -tlskey string
-      path to TLS client key file (default "~/.docker/machine/machines/default/key.pem")
+      path to TLS client key file (default "~/.docker/key.pem")
   -tlsverify
-      verify docker daemon's TLS certicate (default true)
+      verify docker daemon's TLS certicate
   -version
       show version
+  -wait string
+      minimum and maximum durations to wait (e.g. "500ms:2s") before triggering generate
   -watch
       watch for container changes
-  -wait
-      minimum (and/or maximum) duration to wait after each container change before triggering
 
 Arguments:
   template - path to a template to generate
-  dest - path to write the template. If not specfied, STDOUT is used
+  dest - path to write the template to. If not specfied, STDOUT is used
 
 Environment Variables:
   DOCKER_HOST - default value for -endpoint
-  DOCKER_CERT_PATH - directory path containing key.pem, cert.pm and ca.pem
-  DOCKER_TLS_VERIFY - enable client TLS verification]
+  DOCKER_CERT_PATH - directory path containing key.pem, cert.pem and ca.pem
+  DOCKER_TLS_VERIFY - enable client TLS verification
 ```
 
 If no `<dest>` file is specified, the output is sent to stdout. Mainly useful for debugging.

cmd/docker-gen/main.go

@@ -78,7 +78,7 @@ Options:`)
 	println(`
 Arguments:
   template - path to a template to generate
-  dest - path to a write the template.  If not specfied, STDOUT is used`)
+  dest - path to write the template to. If not specfied, STDOUT is used`)
 
 	println(`
 Environment Variables:
@@ -98,23 +98,35 @@ func loadConfig(file string) error {
 }
 
 func initFlags() {
-
 	certPath := filepath.Join(os.Getenv("DOCKER_CERT_PATH"))
 	if certPath == "" {
 		certPath = filepath.Join(os.Getenv("HOME"), ".docker")
 	}
+
 	flag.BoolVar(&version, "version", false, "show version")
+
+	// General configuration options
 	flag.BoolVar(&watch, "watch", false, "watch for container changes")
 	flag.StringVar(&wait, "wait", "", "minimum and maximum durations to wait (e.g. \"500ms:2s\") before triggering generate")
-	flag.BoolVar(&onlyExposed, "only-exposed", false, "only include containers with exposed ports")
+	flag.Var(&configFiles, "config", "config files with template directives. Config files will be merged if this option is specified multiple times.")
+	flag.BoolVar(&keepBlankLines, "keep-blank-lines", false, "keep blank lines in the output file")
 
+	// Containers filtering options
+	flag.BoolVar(&onlyExposed, "only-exposed", false,
+		"only include containers with exposed ports. Bypassed when providing a container exposed filter (-container-filter exposed=foo).")
 	flag.BoolVar(&onlyPublished, "only-published", false,
-		"only include containers with published ports (implies -only-exposed)")
-	flag.BoolVar(&includeStopped, "include-stopped", false, "include stopped containers")
+		"only include containers with published ports (implies -only-exposed). Bypassed when providing a container published filter (-container-filter published=foo).")
+	flag.BoolVar(&includeStopped, "include-stopped", false,
+		"include stopped containers. Bypassed when providing a container status filter (-container-filter status=foo).")
 	flag.Var(&containerFilter, "container-filter",
-		"container filter for inclusion by docker-gen. Using this option bypass the -include-stopped option and set it to true. You can pass this option multiple times to combine filters with AND. https://docs.docker.com/engine/reference/commandline/ps/#filter")
-	flag.BoolVar(&notifyOutput, "notify-output", false, "log the output(stdout/stderr) of notify command")
+		"container filter for inclusion by docker-gen. You can pass this option multiple times to combine filters with AND. https://docs.docker.com/engine/reference/commandline/ps/#filter")
+
+	// Command notification options
 	flag.StringVar(&notifyCmd, "notify", "", "run command after template is regenerated (e.g `restart xyz`)")
+	flag.BoolVar(&notifyOutput, "notify-output", false, "log the output(stdout/stderr) of notify command")
+	flag.IntVar(&interval, "interval", 0, "notify command interval (secs)")
+
+	// Containers notification options
 	flag.Var(&sighupContainerID, "notify-sighup",
 		"send HUP signal to container. Equivalent to docker kill -s HUP `container-ID`. You can pass this option multiple times to send HUP to multiple containers.")
 	flag.Var(&notifyContainerID, "notify-container",
@@ -123,9 +135,8 @@ func initFlags() {
 		"container filter for notification (e.g -notify-filter name=foo). You can pass this option multiple times to combine filters with AND. https://docs.docker.com/engine/reference/commandline/ps/#filter")
 	flag.IntVar(&notifyContainerSignal, "notify-signal", int(docker.SIGHUP),
 		"signal to send to the notify-container and notify-filter. Defaults to SIGHUP")
-	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(&keepBlankLines, "keep-blank-lines", false, "keep blank lines in the output file")
+
+	// Docker API endpoint configuration options
 	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")