Godeps: bump appc/spec to v0.6.1+git.

This commit is contained in:
Yifan Gu
2015-08-10 11:15:13 -07:00
parent f80decbf77
commit 7e5cfd137a
50 changed files with 1379 additions and 108 deletions

View File

@@ -273,7 +273,7 @@ func setIsolators(app *appctypes.App, c *api.Container) error {
r.request = quantity.String()
resources[name] = r
}
var acName appctypes.ACName
var acName appctypes.ACIdentifier
for name, res := range resources {
switch name {
case api.ResourceCPU:
@@ -412,10 +412,14 @@ func (r *runtime) makePodManifest(pod *api.Pod) (*appcschema.PodManifest, error)
return nil, err
}
name, err := appctypes.SanitizeACName(c.Name)
if err != nil {
return nil, err
}
appName := appctypes.MustACName(name)
manifest.Apps = append(manifest.Apps, appcschema.RuntimeApp{
// TODO(yifan): We should allow app name to be different with
// image name. See https://github.com/coreos/rkt/pull/640.
Name: imgManifest.Name,
Name: *appName,
Image: appcschema.RuntimeImage{ID: *hash},
App: imgManifest.App,
})