Signed-off-by: Daniel Nephin <dnephin@docker.com>
| ... | ... |
@@ -287,18 +287,7 @@ func (b *Builder) build(stdout io.Writer, stderr io.Writer, out io.Writer) (stri |
| 287 | 287 |
} |
| 288 | 288 |
} |
| 289 | 289 |
|
| 290 |
- // check if there are any leftover build-args that were passed but not |
|
| 291 |
- // consumed during build. Return a warning, if there are any. |
|
| 292 |
- leftoverArgs := []string{}
|
|
| 293 |
- for arg := range b.options.BuildArgs {
|
|
| 294 |
- if !b.isBuildArgAllowed(arg) {
|
|
| 295 |
- leftoverArgs = append(leftoverArgs, arg) |
|
| 296 |
- } |
|
| 297 |
- } |
|
| 298 |
- |
|
| 299 |
- if len(leftoverArgs) > 0 {
|
|
| 300 |
- fmt.Fprintf(b.Stderr, "[Warning] One or more build-args %v were not consumed\n", leftoverArgs) |
|
| 301 |
- } |
|
| 290 |
+ b.warnOnUnusedBuildArgs() |
|
| 302 | 291 |
|
| 303 | 292 |
if b.image == "" {
|
| 304 | 293 |
return "", errors.New("No image was generated. Is your Dockerfile empty?")
|
| ... | ... |
@@ -326,6 +315,21 @@ func (b *Builder) build(stdout io.Writer, stderr io.Writer, out io.Writer) (stri |
| 326 | 326 |
return b.image, nil |
| 327 | 327 |
} |
| 328 | 328 |
|
| 329 |
+// check if there are any leftover build-args that were passed but not |
|
| 330 |
+// consumed during build. Print a warning, if there are any. |
|
| 331 |
+func (b *Builder) warnOnUnusedBuildArgs() {
|
|
| 332 |
+ leftoverArgs := []string{}
|
|
| 333 |
+ for arg := range b.options.BuildArgs {
|
|
| 334 |
+ if !b.isBuildArgAllowed(arg) {
|
|
| 335 |
+ leftoverArgs = append(leftoverArgs, arg) |
|
| 336 |
+ } |
|
| 337 |
+ } |
|
| 338 |
+ |
|
| 339 |
+ if len(leftoverArgs) > 0 {
|
|
| 340 |
+ fmt.Fprintf(b.Stderr, "[Warning] One or more build-args %v were not consumed\n", leftoverArgs) |
|
| 341 |
+ } |
|
| 342 |
+} |
|
| 343 |
+ |
|
| 329 | 344 |
// Cancel cancels an ongoing Dockerfile build. |
| 330 | 345 |
func (b *Builder) Cancel() {
|
| 331 | 346 |
b.cancel() |