Merge pull request #2098 from crazy-max/annotations-push

build: make annotations work with push flag

commands/build.go

@@ -113,6 +113,7 @@ func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error
 
 	opts := controllerapi.BuildOptions{
 		Allow:          o.allow,
+		Annotations:    o.annotations,
 		BuildArgs:      buildArgs,
 		CgroupParent:   o.cgroupParent,
 		ContextPath:    o.contextPath,
@@ -172,16 +173,6 @@ func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error
 		}
 	}
 
-	annotations, err := buildflags.ParseAnnotations(o.annotations)
-	if err != nil {
-		return nil, err
-	}
-	for _, e := range opts.Exports {
-		for k, v := range annotations {
-			e.Attrs[k.String()] = v
-		}
-	}
-
 	opts.CacheFrom, err = buildflags.ParseCacheEntry(o.cacheFrom)
 	if err != nil {
 		return nil, err

controller/build/build.go

@@ -132,6 +132,17 @@ func RunBuild(ctx context.Context, dockerCli command.Cli, in controllerapi.Build
 			}
 		}
 	}
+
+	annotations, err := buildflags.ParseAnnotations(in.Annotations)
+	if err != nil {
+		return nil, nil, err
+	}
+	for _, o := range outputs {
+		for k, v := range annotations {
+			o.Attrs[k.String()] = v
+		}
+	}
+
 	opts.Exports = outputs
 
 	opts.CacheFrom = controllerapi.CreateCaches(in.CacheFrom)