Merge pull request #130 from AXA-GROUP-SOLUTIONS/include_stopped

include stopped containers

Author: jwilder

README.md

@@ -101,6 +101,8 @@ Options:
       only include containers with exposed ports
   -only-published
       only include containers with published ports (implies -only-exposed)
+  -include-stopped
+      include stopped containers
   -tlscacert string
       path to TLS CA certificate file (default "/Users/jason/.docker/machine/machines/default/ca.pem")
   -tlscert string
@@ -219,6 +221,7 @@ type RuntimeContainer struct {
     IP6LinkLocal string
     IP6Global    string
     Mounts       []Mount
+    State        State
 }
 
 type Address struct {
@@ -270,6 +273,10 @@ type SwarmNode struct {
     Address Address
 }
 
+type State struct {
+  Running bool
+}
+
 // Accessible from the root in templates as .Docker
 type Docker struct {
     Name                 string

cmd/docker-gen/main.go

@@ -25,6 +25,7 @@ var (
 	notifySigHUPContainerID string
 	onlyExposed             bool
 	onlyPublished           bool
+	includeStopped          bool
 	configFiles             stringslice
 	configs                 dockergen.ConfigFile
 	interval                int
@@ -91,6 +92,7 @@ func initFlags() {
 
 	flag.BoolVar(&onlyPublished, "only-published", false,
 		"only include containers with published ports (implies -only-exposed)")
+	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", "",
@@ -143,6 +145,7 @@ func main() {
 			NotifyContainers: make(map[string]docker.Signal),
 			OnlyExposed:      onlyExposed,
 			OnlyPublished:    onlyPublished,
+			IncludeStopped:   includeStopped,
 			Interval:         interval,
 			KeepBlankLines:   keepBlankLines,
 		}
@@ -153,12 +156,20 @@ func main() {
 			Config: []dockergen.Config{config}}
 	}
 
+	all := true
+	for _, config := range configs.Config {
+		if config.IncludeStopped {
+			all = true
+		}
+	}
+
 	generator, err := dockergen.NewGenerator(dockergen.GeneratorConfig{
 		Endpoint:   endpoint,
 		TLSKey:     tlsKey,
 		TLSCert:    tlsCert,
 		TLSCACert:  tlsCaCert,
 		TLSVerify:  tlsVerify,
+		All:        all,
 		ConfigFile: configs,
 	})
 

config.go

@@ -18,6 +18,7 @@ type Config struct {
 	NotifyContainers map[string]docker.Signal
 	OnlyExposed      bool
 	OnlyPublished    bool
+	IncludeStopped   bool
 	Interval         int
 	KeepBlankLines   bool
 }

context.go

@@ -77,6 +77,10 @@ type Volume struct {
 	ReadWrite bool
 }
 
+type State struct {
+	Running bool
+}
+
 type RuntimeContainer struct {
 	ID           string
 	Addresses    []Address
@@ -93,6 +97,7 @@ type RuntimeContainer struct {
 	IP6LinkLocal string
 	IP6Global    string
 	Mounts       []Mount
+	State        State
 }
 
 func (r *RuntimeContainer) Equals(o RuntimeContainer) bool {

generator.go

@@ -20,6 +20,7 @@ type generator struct {
 	Endpoint                   string
 	TLSVerify                  bool
 	TLSCert, TLSCaCert, TLSKey string
+	All                        bool
 
 	wg    sync.WaitGroup
 	retry bool
@@ -32,6 +33,7 @@ type GeneratorConfig struct {
 	TLSKey    string
 	TLSCACert string
 	TLSVerify bool
+	All       bool
 
 	ConfigFile ConfigFile
 }
@@ -62,6 +64,7 @@ func NewGenerator(gc GeneratorConfig) (*generator, error) {
 		TLSCert:   gc.TLSCert,
 		TLSCaCert: gc.TLSCACert,
 		TLSKey:    gc.TLSKey,
+		All:       gc.All,
 		Configs:   gc.ConfigFile,
 		retry:     true,
 	}, nil
@@ -347,7 +350,7 @@ func (g *generator) getContainers() ([]*RuntimeContainer, error) {
 	}
 
 	apiContainers, err := g.Client.ListContainers(docker.ListContainersOptions{
-		All:  false,
+		All:  g.All,
 		Size: false,
 	})
 	if err != nil {
@@ -370,6 +373,9 @@ func (g *generator) getContainers() ([]*RuntimeContainer, error) {
 				Repository: repository,
 				Tag:        tag,
 			},
+			State: State{
+				Running: container.State.Running,
+			},
 			Name:         strings.TrimLeft(container.Name, "/"),
 			Hostname:     container.Config.Hostname,
 			Gateway:      container.NetworkSettings.Gateway,

template.go

@@ -259,7 +259,7 @@ func keys(input interface{}) (interface{}, error) {
 
 	vk := val.MapKeys()
 	k := make([]interface{}, val.Len())
-	for i, _ := range k {
+	for i := range k {
 		k[i] = vk[i].Interface()
 	}
 
@@ -452,22 +452,37 @@ func newTemplate(name string) *template.Template {
 	return tmpl
 }
 
+func filterRunning(config Config, containers Context) Context {
+	if config.IncludeStopped {
+		return containers
+	} else {
+		filteredContainers := Context{}
+		for _, container := range containers {
+			if container.State.Running {
+				filteredContainers = append(filteredContainers, container)
+			}
+		}
+		return filteredContainers
+	}
+}
+
 func GenerateFile(config Config, containers Context) bool {
+	filteredRunningContainers := filterRunning(config, containers)
 	filteredContainers := Context{}
 	if config.OnlyPublished {
-		for _, container := range containers {
+		for _, container := range filteredRunningContainers {
 			if len(container.PublishedAddresses()) > 0 {
 				filteredContainers = append(filteredContainers, container)
 			}
 		}
 	} else if config.OnlyExposed {
-		for _, container := range containers {
+		for _, container := range filteredRunningContainers {
 			if len(container.Addresses) > 0 {
 				filteredContainers = append(filteredContainers, container)
 			}
 		}
 	} else {
-		filteredContainers = containers
+		filteredContainers = filteredRunningContainers
 	}
 
 	contents := executeTemplate(config.Template, filteredContainers)