Merge pull request #512 from CpuID/cpuid_build_options

Extra options for "build" sections in YAML

Author: vdemeester

config/schema.go

@@ -219,7 +219,11 @@ var servicesSchemaDataV2 = `{
               "properties": {
                 "context": {"type": "string"},
                 "dockerfile": {"type": "string"},
-                "args": {"$ref": "#/definitions/list_or_dict"}
+                "args": {"$ref": "#/definitions/list_or_dict"},
+                "cache_from": {"$ref": "#/definitions/list_of_strings"},
+                "labels": {"$ref": "#/definitions/list_or_dict"},
+                "network": {"type": "string"},
+                "target": {"type": "string"}
               },
               "additionalProperties": false
             }

docker/builder/builder.go

@@ -43,6 +43,9 @@ type DaemonBuilder struct {
 	Pull             bool
 	BuildArgs        map[string]*string
 	CacheFrom        []string
+	Labels           map[string]*string
+	Network          string
+	Target           string
 	LoggerFactory    logger.Factory
 }
 
@@ -88,6 +91,12 @@ func (d *DaemonBuilder) Build(ctx context.Context, imageName string) error {
 		outFd, isTerminalOut = term.GetFdInfo(w)
 	}
 
+	// Convert map[string]*string to map[string]string
+	labels := make(map[string]string)
+	for lk, lv := range d.Labels {
+		labels[lk] = *lv
+	}
+
 	response, err := d.Client.ImageBuild(ctx, body, types.ImageBuildOptions{
 		Tags:        []string{imageName},
 		NoCache:     d.NoCache,
@@ -98,6 +107,9 @@ func (d *DaemonBuilder) Build(ctx context.Context, imageName string) error {
 		AuthConfigs: d.AuthConfigs,
 		BuildArgs:   d.BuildArgs,
 		CacheFrom:   d.CacheFrom,
+		Labels:      labels,
+		NetworkMode: d.Network,
+		Target:      d.Target,
 	})
 	if err != nil {
 		return err

yaml/build.go

@@ -13,6 +13,12 @@ type Build struct {
 	Context    string
 	Dockerfile string
 	Args       map[string]*string
+	CacheFrom  []*string
+	Labels     map[string]*string
+	// TODO: ShmSize (can be a string or int?) for v3.5
+	Target string
+	// Note: as of Sep 2018 this is undocumented but supported by docker-compose
+	Network string
 }
 
 // MarshalYAML implements the Marshaller interface.
@@ -27,6 +33,18 @@ func (b Build) MarshalYAML() (interface{}, error) {
 	if len(b.Args) > 0 {
 		m["args"] = b.Args
 	}
+	if len(b.CacheFrom) > 0 {
+		m["cache_from"] = b.CacheFrom
+	}
+	if len(b.Labels) > 0 {
+		m["labels"] = b.Labels
+	}
+	if b.Target != "" {
+		m["target"] = b.Target
+	}
+	if b.Network != "" {
+		m["network"] = b.Network
+	}
 	return m, nil
 }
 
@@ -52,6 +70,22 @@ func (b *Build) UnmarshalYAML(unmarshal func(interface{}) error) error {
 					return err
 				}
 				b.Args = args
+			case "cache_from":
+				cacheFrom, err := handleBuildCacheFrom(mapValue)
+				if err != nil {
+					return err
+				}
+				b.CacheFrom = cacheFrom
+			case "labels":
+				labels, err := handleBuildLabels(mapValue)
+				if err != nil {
+					return err
+				}
+				b.Labels = labels
+			case "target":
+				b.Target = mapValue.(string)
+			case "network":
+				b.Network = mapValue.(string)
 			default:
 				// Ignore unknown keys
 				continue
@@ -67,15 +101,44 @@ func handleBuildArgs(value interface{}) (map[string]*string, error) {
 	var args map[string]*string
 	switch v := value.(type) {
 	case map[interface{}]interface{}:
-		return handleBuildArgMap(v)
+		return handleBuildOptionMap(v)
 	case []interface{}:
-		return handleBuildArgSlice(v)
+		return handleBuildArgsSlice(v)
 	default:
 		return args, fmt.Errorf("Failed to unmarshal Build args: %#v", value)
 	}
 }
 
-func handleBuildArgSlice(s []interface{}) (map[string]*string, error) {
+func handleBuildCacheFrom(value interface{}) ([]*string, error) {
+	var cacheFrom []*string
+	switch v := value.(type) {
+	case []interface{}:
+		return handleBuildCacheFromSlice(v)
+	default:
+		return cacheFrom, fmt.Errorf("Failed to unmarshal Build cache_from: %#v", value)
+	}
+}
+
+func handleBuildLabels(value interface{}) (map[string]*string, error) {
+	var labels map[string]*string
+	switch v := value.(type) {
+	case map[interface{}]interface{}:
+		return handleBuildOptionMap(v)
+	default:
+		return labels, fmt.Errorf("Failed to unmarshal Build labels: %#v", value)
+	}
+}
+
+func handleBuildCacheFromSlice(s []interface{}) ([]*string, error) {
+	var args = []*string{}
+	for _, arg := range s {
+		strArg := arg.(string)
+		args = append(args, &strArg)
+	}
+	return args, nil
+}
+
+func handleBuildArgsSlice(s []interface{}) (map[string]*string, error) {
 	var args = map[string]*string{}
 	for _, arg := range s {
 		// check if a value is provided
@@ -93,7 +156,8 @@ func handleBuildArgSlice(s []interface{}) (map[string]*string, error) {
 	return args, nil
 }
 
-func handleBuildArgMap(m map[interface{}]interface{}) (map[string]*string, error) {
+// Used for args and labels
+func handleBuildOptionMap(m map[interface{}]interface{}) (map[string]*string, error) {
 	args := map[string]*string{}
 	for mapKey, mapValue := range m {
 		var argValue string

yaml/build_test.go

@@ -8,9 +8,12 @@ import (
 )
 
 var (
-	buildno = "1"
-	user    = "vincent"
-	empty   = "\x00"
+	buildno       = "1"
+	user          = "vincent"
+	empty         = "\x00"
+	testCacheFrom = "someotherimage:latest"
+	target        = "intermediateimage"
+	network       = "buildnetwork"
 )
 
 func TestMarshalBuild(t *testing.T) {
@@ -46,12 +49,28 @@ dockerfile: alternate
 					"buildno": &buildno,
 					"user":    &user,
 				},
+				CacheFrom: []*string{
+					&testCacheFrom,
+				},
+				Labels: map[string]*string{
+					"buildno": &buildno,
+					"user":    &user,
+				},
+				Target:  target,
+				Network: network,
 			},
 			expected: `args:
   buildno: "1"
   user: vincent
+cache_from:
+- someotherimage:latest
 context: .
 dockerfile: alternate
+labels:
+  buildno: "1"
+  user: vincent
+network: buildnetwork
+target: intermediateimage
 `,
 		},
 	}
@@ -92,14 +111,31 @@ dockerfile: alternate`,
 dockerfile: alternate
 args:
   buildno: 1
-  user: vincent`,
+  user: vincent
+cache_from:
+  - someotherimage:latest
+labels:
+  buildno: "1"
+  user: vincent
+target: intermediateimage
+network: buildnetwork
+`,
 			expected: &Build{
 				Context:    ".",
 				Dockerfile: "alternate",
 				Args: map[string]*string{
 					"buildno": &buildno,
 					"user":    &user,
 				},
+				CacheFrom: []*string{
+					&testCacheFrom,
+				},
+				Labels: map[string]*string{
+					"buildno": &buildno,
+					"user":    &user,
+				},
+				Target:  target,
+				Network: network,
 			},
 		},
 		{