rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-09 02:31:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1008 from joshwget/legacy-labels

Browse Source 
Support legacy Docker Compose labels
This commit is contained in:
Denise
2016-06-13 18:36:46 -07:00
committed by GitHub
parent 30d988d5b0 313cdb7e24
commit 6d3ac8d734
6 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker/service.go
View File

@@ -1,6 +1,8 @@
package docker
import (
"fmt"
"github.com/Sirupsen/logrus"
dockerclient "github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
@@ -150,7 +152,9 @@ func (s *Service) Up(ctx context.Context, options options.Up) error {
return err
}
}
s.rename(ctx)
if err = s.rename(ctx); err != nil {
return err
}
}
if labels[config.CREATE_ONLY] == "true" {
return s.checkReload(labels)
@@ -186,7 +190,7 @@ func (s *Service) getContainer(ctx context.Context) (dockerclient.APIClient, typ
}
if len(containers) == 0 {
return nil, types.ContainerJSON{}, nil
return nil, types.ContainerJSON{}, fmt.Errorf("No containers found for %s", s.Name())
}
id, err := containers[0].ID()