Skip to content

Commit

Permalink
update packages to latest docker version
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel van Gils committed Oct 17, 2016
1 parent 875be9f commit 4efdea1
Show file tree
Hide file tree
Showing 236 changed files with 19,189 additions and 2,195 deletions.
263 changes: 156 additions & 107 deletions Godeps/Godeps.json

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion build/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ func (b *Builder) BuildStep(step *Step) error {
buildArgs = append(buildArgs, docker.BuildArg{Name: s.Key, Value: s.Value})
}
// call Docker to build the Dockerfile (from the parsed file)

b.Conf.Logger.Infof("Building the %s image from %s", b.uniqueStepName(step), filepath.Base(b.uniqueDockerfile(step)))
opts := docker.BuildImageOptions{
Name: b.uniqueStepName(step),
Expand All @@ -244,6 +245,8 @@ func (b *Builder) BuildStep(step *Step) error {
}

err = b.docker.BuildImage(opts)
b.Conf.Logger.Noticef("Check tagging of %s", b.uniqueStepName(step))

if err != nil {
return err
}
Expand Down Expand Up @@ -534,7 +537,9 @@ func (b *Builder) replaceFromField(step *Step) error {
}
defer rwc.Close()

node, err := parser.Parse(rwc)
d := parser.Directive{LookingForDirectives: true}
parser.SetEscapeToken(parser.DefaultEscapeToken, &d)
node, err := parser.Parse(rwc, &d)
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/Microsoft/go-winio/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/github.com/Microsoft/go-winio/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/github.com/Microsoft/go-winio/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

266 changes: 266 additions & 0 deletions vendor/github.com/Microsoft/go-winio/backup.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4efdea1

Please sign in to comment.