@@ -2,6 +2,7 @@ package task
2
2
3
3
import (
4
4
"encoding/json"
5
+ "fmt"
5
6
"io"
6
7
"io/ioutil"
7
8
"os"
@@ -63,6 +64,7 @@ func Build(buildkitd *Buildkitd, outputsDir string, req Request) (Response, erro
63
64
}
64
65
65
66
var builds [][]string
67
+ var targets []string
66
68
var imagePaths []string
67
69
68
70
for _ , t := range cfg .AdditionalTargets {
@@ -85,6 +87,7 @@ func Build(buildkitd *Buildkitd, outputsDir string, req Request) (Response, erro
85
87
}
86
88
87
89
builds = append (builds , targetArgs )
90
+ targets = append (targets , t )
88
91
}
89
92
90
93
finalTargetDir := filepath .Join (outputsDir , "image" )
@@ -104,18 +107,28 @@ func Build(buildkitd *Buildkitd, outputsDir string, req Request) (Response, erro
104
107
}
105
108
106
109
builds = append (builds , buildctlArgs )
110
+ targets = append (targets , "" )
107
111
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
+ }
112
123
113
124
if _ , err := os .Stat (filepath .Join (cacheDir , "index.json" )); err == nil {
114
125
args = append (args ,
115
126
"--import-cache" , "type=local,src=" + cacheDir ,
116
127
)
117
128
}
118
129
130
+ logrus .Debugf ("running buildctl %s" , strings .Join (args , " " ))
131
+
119
132
err = buildctl (buildkitd .Addr , os .Stdout , args ... )
120
133
if err != nil {
121
134
return Response {}, errors .Wrap (err , "build" )
0 commit comments