feat: allow multiple -notify-sighup / -notify-container

Author: buchdag

README.md

@@ -99,8 +99,13 @@ Options:
       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
-      container to send a signal to
+      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 have multiple of these.
@@ -109,8 +114,6 @@ Options:
       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/01804dec8a84d0a77e63611f2b62d33e9bb2b64a/signal.go
-  -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`
   -only-exposed
       only include containers with exposed ports
   -only-published

cmd/docker-gen/main.go

@@ -26,8 +26,8 @@ var (
 	wait                  string
 	notifyCmd             string
 	notifyOutput          bool
-	sighupContainerID     string
-	notifyContainerID     string
+	sighupContainerID     stringslice
+	notifyContainerID     stringslice
 	notifyContainerSignal int
 	notifyContainerFilter mapstringslice = make(mapstringslice)
 	onlyExposed           bool
@@ -112,10 +112,10 @@ func initFlags() {
 	flag.BoolVar(&includeStopped, "include-stopped", false, "include stopped containers")
 	flag.BoolVar(&notifyOutput, "notify-output", false, "log the output(stdout/stderr) of notify command")
 	flag.StringVar(&notifyCmd, "notify", "", "run command after template is regenerated (e.g `restart xyz`)")
-	flag.StringVar(&sighupContainerID, "notify-sighup", "",
-		"send HUP signal to container.  Equivalent to docker kill -s HUP `container-ID`")
-	flag.StringVar(&notifyContainerID, "notify-container", "",
-		"container to send a signal to")
+	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",
+		"send -notify-signal signal (defaults to 1 / HUP) to container. You can pass this option multiple times to notify multiple containers.")
 	flag.Var(&notifyContainerFilter, "notify-filter",
 		"container filter for notification (e.g -notify-filter name=foo). You can have multiple of these. https://docs.docker.com/engine/reference/commandline/ps/#filter")
 	flag.IntVar(&notifyContainerSignal, "notify-signal", int(docker.SIGHUP),
@@ -176,11 +176,11 @@ func main() {
 			Interval:         interval,
 			KeepBlankLines:   keepBlankLines,
 		}
-		if sighupContainerID != "" {
-			cfg.NotifyContainers[sighupContainerID] = int(syscall.SIGHUP)
+		for _, id := range sighupContainerID {
+			cfg.NotifyContainers[id] = int(syscall.SIGHUP)
 		}
-		if notifyContainerID != "" {
-			cfg.NotifyContainers[notifyContainerID] = notifyContainerSignal
+		for _, id := range notifyContainerID {
+			cfg.NotifyContainers[id] = notifyContainerSignal
 		}
 		if len(notifyContainerFilter) > 0 {
 			cfg.NotifyContainersFilter = notifyContainerFilter