Skip to content

Commit 25121ea

Browse files
vitotaylorsilva
andcommitted
add log lines for building multiple targets
Signed-off-by: Alex Suraci <suraci.alex@gmail.com> Co-authored-by: Taylor Silva <tsilva@pivotal.io>
1 parent 02d8430 commit 25121ea

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

task.go

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package task
22

33
import (
44
"encoding/json"
5+
"fmt"
56
"io"
67
"io/ioutil"
78
"os"
@@ -63,6 +64,7 @@ func Build(buildkitd *Buildkitd, outputsDir string, req Request) (Response, erro
6364
}
6465

6566
var builds [][]string
67+
var targets []string
6668
var imagePaths []string
6769

6870
for _, t := range cfg.AdditionalTargets {
@@ -85,6 +87,7 @@ func Build(buildkitd *Buildkitd, outputsDir string, req Request) (Response, erro
8587
}
8688

8789
builds = append(builds, targetArgs)
90+
targets = append(targets, t)
8891
}
8992

9093
finalTargetDir := filepath.Join(outputsDir, "image")
@@ -104,18 +107,28 @@ func Build(buildkitd *Buildkitd, outputsDir string, req Request) (Response, erro
104107
}
105108

106109
builds = append(builds, buildctlArgs)
110+
targets = append(targets, "")
107111

108-
for _, args := range builds {
109-
logrus.WithFields(logrus.Fields{
110-
"buildctl-args": args,
111-
}).Debug("building")
112+
for i, args := range builds {
113+
if i > 0 {
114+
fmt.Fprintln(os.Stderr)
115+
}
116+
117+
targetName := targets[i]
118+
if targetName == "" {
119+
logrus.Info("building image")
120+
} else {
121+
logrus.Infof("building target '%s'", targetName)
122+
}
112123

113124
if _, err := os.Stat(filepath.Join(cacheDir, "index.json")); err == nil {
114125
args = append(args,
115126
"--import-cache", "type=local,src="+cacheDir,
116127
)
117128
}
118129

130+
logrus.Debugf("running buildctl %s", strings.Join(args, " "))
131+
119132
err = buildctl(buildkitd.Addr, os.Stdout, args...)
120133
if err != nil {
121134
return Response{}, errors.Wrap(err, "build")

0 commit comments

Comments
 (0)