kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Improve docs for Daemon.TagImage and dockerfile.BuildFromConfig.

Browse source 
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
This commit is contained in:
Lukas Waslowski 2016-01-05 14:33:20 +01:00
parent 3a8d694e01
commit a4ce361ac8
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
builder/dockerfile/builder.go
View file

@ -173,11 +173,15 @@ func (b *Builder) Cancel() {
})
}
// BuildFromConfig will do build directly from parameter 'changes', which comes
// from Dockerfile entries, it will:
// - call parse.Parse() to get AST root from Dockerfile entries
// - do build by calling builder.dispatch() to call all entries' handling routines
// TODO: remove?
// BuildFromConfig will do build directly from parameter 'changes',
// which is treated like it is coming from a Dockerfile. It will:
// - Call parse.Parse() to get an AST root for the concatenated Dockerfile entries.
// - Do build by calling builder.dispatch() to call all entries' handling routines
//
// BuildFromConfig is used by the /commit endpoint, with the changes
// coming from the query parameter of the same name.
//
// TODO: Remove?
func BuildFromConfig(config *container.Config, changes []string) (*container.Config, error) {
ast, err := parser.Parse(bytes.NewBufferString(strings.Join(changes, "\n")))
if err != nil {

4
daemon/daemon.go
View file

@ -1013,8 +1013,8 @@ func (daemon *Daemon) changes(container *container.Container) ([]archive.Change,
return container.RWLayer.Changes()
}
// TagImage creates a tag in the repository reponame, pointing to the image named
// imageName.
// TagImage creates a tag in the repository and with the name specified by newTag,
// pointing to the image named imageName (alternatively, imageName can also be an image ID).
func (daemon *Daemon) TagImage(newTag reference.Named, imageName string) error {
imageID, err := daemon.GetImageID(imageName)
if err != nil {