centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 14:25:46 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21002 from tonistiigi/fix-id-noprefix

Browse Source 
Fix docker run for 64 byte hex ID
This commit is contained in:
David Calavera
2016-03-14 10:17:38 -07:00
parent 8e74cf59d0 16e4c4e481
commit df20b5cfd3
5 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/client/create.go
View File

@@ -92,21 +92,22 @@ func (cli *DockerCli) createContainer(config *container.Config, hostConfig *cont
defer containerIDFile.Close()
}
ref, err := reference.ParseNamed(config.Image)
var trustedRef reference.Canonical
_, ref, err := reference.ParseIDOrReference(config.Image)
if err != nil {
return nil, err
}
ref = reference.WithDefaultTag(ref)
if ref != nil {
ref = reference.WithDefaultTag(ref)
var trustedRef reference.Canonical
if ref, ok := ref.(reference.NamedTagged); ok && isTrusted() {
var err error
trustedRef, err = cli.trustedReference(ref)
if err != nil {
return nil, err
if ref, ok := ref.(reference.NamedTagged); ok && isTrusted() {
var err error
trustedRef, err = cli.trustedReference(ref)
if err != nil {
return nil, err
}
config.Image = trustedRef.String()
}
config.Image = trustedRef.String()
}
//create the container
@@ -114,7 +115,7 @@ func (cli *DockerCli) createContainer(config *container.Config, hostConfig *cont
//if image not found try to pull it
if err != nil {
if client.IsErrImageNotFound(err) {
if client.IsErrImageNotFound(err) && ref != nil {
fmt.Fprintf(cli.err, "Unable to find image '%s' locally\n", ref.String())
// we don't want to write to stdout anything apart from container.ID