Merge branch 'fix-cache-image' into 'master'

CMGS · CMGS · commit 44aca7ccb884 · 2017-04-20T16:57:44.000Z
Fix cache image

See merge request !93
diff --git a/cluster/calcium/remove_container.go b/cluster/calcium/remove_container.go
@@ -74,7 +74,7 @@ func (c *calcium) RemoveContainer(ids []string) (chan *types.RemoveContainerMess
 			}
 
 			wg.Add(1)
-			ib.Add(container.Podname, info.Image)
+			ib.Add(container.Podname, info.Config.Image)
 			go func(container *types.Container, info enginetypes.ContainerJSON) {
 				defer wg.Done()
 
diff --git a/eru-core.service b/eru-core.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=simple
 Environment=GOTRACEBACK=crash
-ExecStart=/usr/bin/eru-core --config /etc/eru-core/core.yaml --log-level DEBUG
+ExecStart=/usr/bin/eru-core --config /etc/eru-core/core.yaml
 LimitNOFILE=10485760
 LimitNPROC=10485760
 LimitCORE=infinity

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func (c calcium) RemoveContainer(ids []string) (chan types.RemoveContainerMess`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`wg.Add(1)`
`77`		`- ib.Add(container.Podname, info.Image)`
	`77`	`+ ib.Add(container.Podname, info.Config.Image)`
`78`	`78`	`go func(container *types.Container, info enginetypes.ContainerJSON) {`
`79`	`79`	`defer wg.Done()`
`80`	`80`