toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the FROM instruction pull the image if not existing

Browse Source 
Upstream-commit: 924b61328cd63fc8b1da77d9cb4f1e6b85eb1592
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-05-06 16:01:01 -07:00
parent 9db7d3be72
commit d86a77b5fe
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/builder.go
+20 -1
View File
@@ -198,8 +198,27 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
fmt.Fprintf(stdout, "FROM %s\n", arguments)
image, err = builder.runtime.repositories.LookupImage(arguments)
if err != nil {
return nil, err
if builder.runtime.graph.IsNotExist(err) {
if builder.runtime.graph.LookupRemoteImage(arguments, builder.runtime.authConfig) {
if err := builder.runtime.graph.PullImage(stdout, arguments, builder.runtime.authConfig); err != nil {
return nil, err
}
} else {
// FIXME: Allow pull repo:tag
if err := builder.runtime.graph.PullRepository(stdout, arguments, "", builder.runtime.repositories, builder.runtime.authConfig); err != nil {
return nil, err
}
}
image, err = builder.runtime.repositories.LookupImage(arguments)
if err != nil {
return nil, err
}
} else {
return nil, err
}
}
break
case "run":
fmt.Fprintf(stdout, "RUN %s\n", arguments)