docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pull only latest if no tag 

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Victor Vieux 2015-03-17 16:02:31 -07:00
parent b04197d3c0
commit b9e600d38d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/swarm/node.go
View File

@ -403,6 +403,9 @@ func (n *node) destroy(container *cluster.Container, force bool) error {
}
func (n *node) pull(image string) error {
if !strings.Contains(image, ":") {
image = image + ":latest"
}
if err := n.client.PullImage(image, nil); err != nil {
return err
}

2
cluster/swarm/node_test.go
View File

@ -213,7 +213,7 @@ func TestCreateContainer(t *testing.T) {
name = "test3"
id = "id3"
mockConfig.CpuShares = config.CpuShares * mockInfo.NCPU
client.On("PullImage", config.Image, mock.Anything).Return(nil).Once()
client.On("PullImage", config.Image+":latest", mock.Anything).Return(nil).Once()
client.On("CreateContainer", &mockConfig, name).Return("", dockerclient.ErrNotFound).Once()
client.On("CreateContainer", &mockConfig, name).Return(id, nil).Once()
client.On("ListContainers", true, false, fmt.Sprintf(`{"id":[%q]}`, id)).Return([]dockerclient.Container{{Id: id}}, nil).Once()