kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

validate: please vet 

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2018-07-11 23:52:03 +00:00
parent 195919d9d6
commit 81599222fc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/builder-next/builder.go
View File

@ -237,7 +237,7 @@ func (b *Builder) Build(ctx context.Context, opt backend.BuildConfig) (*builder.
Session: opt.Options.SessionID, Session: opt.Options.SessionID,
} }
aux := streamformatter.AuxFormatter{opt.ProgressWriter.Output} aux := streamformatter.AuxFormatter{Writer: opt.ProgressWriter.Output}
eg, ctx := errgroup.WithContext(ctx) eg, ctx := errgroup.WithContext(ctx)

6
builder/dockerfile/dispatchers_test.go
View File

@ -137,10 +137,10 @@ func TestFromWithArg(t *testing.T) {
args := NewBuildArgs(make(map[string]*string)) args := NewBuildArgs(make(map[string]*string))
val := "sometag" val := "sometag"
metaArg := instructions.ArgCommand{ metaArg := instructions.ArgCommand{KeyValuePairOptional: instructions.KeyValuePairOptional{
Key: "THETAG", Key: "THETAG",
Value: &val, Value: &val,
} }}
cmd := &instructions.Stage{ cmd := &instructions.Stage{
BaseName: "alpine:${THETAG}", BaseName: "alpine:${THETAG}",
} }
@ -377,7 +377,7 @@ func TestArg(t *testing.T) {
argName := "foo" argName := "foo"
argVal := "bar" argVal := "bar"
cmd := &instructions.ArgCommand{Key: argName, Value: &argVal} cmd := &instructions.ArgCommand{KeyValuePairOptional: instructions.KeyValuePairOptional{Key: argName, Value: &argVal}}
err := dispatch(sb, cmd) err := dispatch(sb, cmd)
assert.NilError(t, err) assert.NilError(t, err)