Merge pull request #273 from vdemeester/add-config-command

Add a config command

Author: joshwget

cli/app/app.go

@@ -275,6 +275,16 @@ func ProjectKill(p project.APIProject, c *cli.Context) error {
 	return nil
 }
 
+// ProjectConfig validates and print the compose file.
+func ProjectConfig(p project.APIProject, c *cli.Context) error {
+	yaml, err := p.Config()
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	fmt.Println(yaml)
+	return nil
+}
+
 // ProjectPause pauses service containers.
 func ProjectPause(p project.APIProject, c *cli.Context) error {
 	err := p.Pause(context.Background(), c.Args()...)

cli/command/command.go

@@ -45,6 +45,15 @@ func CreateCommand(factory app.ProjectFactory) cli.Command {
 	}
 }
 
+// ConfigCommand defines the libcompose config subcommand
+func ConfigCommand(factory app.ProjectFactory) cli.Command {
+	return cli.Command{
+		Name:   "config",
+		Usage:  "Validate and view the compose file.",
+		Action: app.WithProject(factory, app.ProjectConfig),
+	}
+}
+
 // BuildCommand defines the libcompose build subcommand.
 func BuildCommand(factory app.ProjectFactory) cli.Command {
 	return cli.Command{

cli/main/main.go

@@ -23,6 +23,7 @@ func main() {
 	app.Flags = append(command.CommonFlags(), dockerApp.DockerClientFlags()...)
 	app.Commands = []cli.Command{
 		command.BuildCommand(factory),
+		command.ConfigCommand(factory),
 		command.CreateCommand(factory),
 		command.EventsCommand(factory),
 		command.DownCommand(factory),

config/merge_test.go

@@ -58,15 +58,16 @@ services:
 		child := config["child"]
 
 		if parent.Image != "foo" {
-			t.Fatal("Invalid image", parent.Image)
+			t.Fatal("Invalid parent image", parent.Image)
 		}
 
+		t.Logf("%#v", config["child"])
 		if child.Build.Context != "" {
-			t.Fatal("Invalid build", child.Build)
+			t.Fatalf("Invalid build %#v", child.Build)
 		}
 
 		if child.Image != "foo" {
-			t.Fatal("Invalid image", child.Image)
+			t.Fatal("Invalid child image", child.Image)
 		}
 	}
 }

config/types.go

@@ -226,6 +226,13 @@ func (c *ServiceConfigs) Keys() []string {
 	return keys
 }
 
+// All returns all the config at once
+func (c *ServiceConfigs) All() map[string]*ServiceConfig {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+	return c.m
+}
+
 // RawService is represent a Service in map form unparsed
 type RawService map[string]interface{}
 

integration/assets/v2-dependencies/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "2.0"
+services:
+    db:
+      image: busybox:latest
+      command: top
+    web:
+      image: busybox:latest
+      command: top
+      depends_on:
+        - db
+    console:
+      image: busybox:latest
+      command: top

integration/assets/v2-full/Dockerfile

@@ -0,0 +1,4 @@
+
+FROM busybox:latest
+RUN  echo something
+CMD  top

integration/assets/v2-full/docker-compose.yml

@@ -0,0 +1,25 @@
+
+version: "2"
+
+volumes:
+  data:
+    driver: local
+
+networks:
+  front: {}
+
+services:
+  web:
+    build:
+      context: .
+    networks:
+      - front
+      - default
+    volumes_from:
+      - other
+
+  other:
+    image: busybox:latest
+    command: top
+    volumes:
+      - /data

integration/assets/v2-simple/docker-compose.yml

@@ -0,0 +1,8 @@
+version: "2"
+services:
+  simple:
+    image: busybox:latest
+    command: top
+  another:
+    image: busybox:latest
+    command: top

integration/assets/v2-simple/links-invalid.yml

@@ -0,0 +1,10 @@
+version: "2"
+services:
+  simple:
+    image: busybox:latest
+    command: top
+    links:
+      - another
+  another:
+    image: busybox:latest
+    command: top