Allow more notify and restart options nginx-proxy#283 nginx-proxy#283

Author: bugficks

README.md

@@ -91,8 +91,13 @@ Options:
       run command after template is regenerated (e.g restart xyz)
   -notify-output
       log the output(stdout/stderr) of notify command
+  -notify-container container-ID
+      container to send a signal to
+  -notify-signal signal
+      signal to send to the -notify-container. -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'
+      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

@@ -24,7 +24,8 @@ var (
 	wait                    string
 	notifyCmd               string
 	notifyOutput            bool
-	notifySigHUPContainerID string
+	notifyContainerID     	string
+	notifyContainerSignal	int
 	onlyExposed             bool
 	onlyPublished           bool
 	includeStopped          bool
@@ -97,8 +98,9 @@ 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(&notifySigHUPContainerID, "notify-sighup", "",
-		"send HUP signal to container.  Equivalent to docker kill -s HUP `container-ID`")
+	flag.StringVar(&notifyContainerID, "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.IntVar(&notifyContainerSignal, "notify-signal", int(docker.SIGHUP), "signal to send to the notify-container. 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")
@@ -155,8 +157,8 @@ func main() {
 			Interval:         interval,
 			KeepBlankLines:   keepBlankLines,
 		}
-		if notifySigHUPContainerID != "" {
-			config.NotifyContainers[notifySigHUPContainerID] = docker.SIGHUP
+		if notifyContainerID != "" {
+			config.NotifyContainers[notifyContainerID] = docker.Signal(notifyContainerSignal)
 		}
 		configs = dockergen.ConfigFile{
 			Config: []dockergen.Config{config}}

generator.go

@@ -331,6 +331,14 @@ func (g *generator) sendSignalToContainer(config Config) {
 
 	for container, signal := range config.NotifyContainers {
 		log.Printf("Sending container '%s' signal '%v'", container, signal)
+
+		if signal == -1 {
+			if err := g.Client.RestartContainer(container, 10); err != nil {
+				log.Printf("Error sending restarting container: %s", err)
+			}
+			return
+		}
+
 		killOpts := docker.KillContainerOptions{
 			ID:     container,
 			Signal: signal,