Merge pull request #664 from Junnplus/compose-up-build-labels

support labels in compose up --build

Author: AkihiroSuda

pkg/composer/serviceparser/build.go

@@ -31,7 +31,7 @@ import (
 
 func parseBuildConfig(c *types.BuildConfig, project *types.Project, imageName string) (*Build, error) {
 	if unknown := reflectutil.UnknownNonEmptyFields(c,
-		"Context", "Dockerfile", "Args", "CacheFrom", "Target",
+		"Context", "Dockerfile", "Args", "CacheFrom", "Target", "Labels",
 	); len(unknown) > 0 {
 		logrus.Warnf("Ignoring: build: %+v", unknown)
 	}
@@ -76,6 +76,12 @@ func parseBuildConfig(c *types.BuildConfig, project *types.Project, imageName st
 		b.BuildArgs = append(b.BuildArgs, "--target="+c.Target)
 	}
 
+	if c.Labels != nil {
+		for k, v := range c.Labels {
+			b.BuildArgs = append(b.BuildArgs, "--label="+k+"="+v)
+		}
+	}
+
 	b.BuildArgs = append(b.BuildArgs, ctxDir)
 	return &b, nil
 }

pkg/composer/serviceparser/build_test.go

@@ -41,6 +41,8 @@ services:
     build:
       context: ./barctx
       target: bartgt
+      labels:
+        bar: baz
 `
 	comp := testutil.NewComposeDir(t, dockerComposeYAML)
 	defer comp.CleanUp()
@@ -70,4 +72,5 @@ services:
 	assert.Equal(t, true, bar.Build.Force)
 	assert.Equal(t, project.RelativePath("barctx"), lastOf(bar.Build.BuildArgs))
 	assert.Assert(t, in(bar.Build.BuildArgs, "--target=bartgt"))
+	assert.Assert(t, in(bar.Build.BuildArgs, "--label=bar=baz"))
 }