rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-07 03:48:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #531 from ibuildthecloud/godep2

Browse Source 
Update godeps for libcompose
This commit is contained in:
Ivan Mikushin 2015-08-27 14:48:58 +05:00
commit 00461fdca0
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Godeps/Godeps.json generated
View File

@ -250,33 +250,33 @@
}, },
{ {
"ImportPath": "github.com/docker/libcompose/cli/logger", "ImportPath": "github.com/docker/libcompose/cli/logger",
"Comment": "v0.0.2-ros", "Comment": "v0.0.2-ros-1-g6815465",
"Rev": "48a1ac9a0aceeea67279b689e446a8dfcdc7033f" "Rev": "68154659ac7ebd81f0e61b14750393f2fbc0eca4"
}, },
{ {
"ImportPath": "github.com/docker/libcompose/docker", "ImportPath": "github.com/docker/libcompose/docker",
"Comment": "v0.0.2-ros", "Comment": "v0.0.2-ros-1-g6815465",
"Rev": "48a1ac9a0aceeea67279b689e446a8dfcdc7033f" "Rev": "68154659ac7ebd81f0e61b14750393f2fbc0eca4"
}, },
{ {
"ImportPath": "github.com/docker/libcompose/logger", "ImportPath": "github.com/docker/libcompose/logger",
"Comment": "v0.0.2-ros", "Comment": "v0.0.2-ros-1-g6815465",
"Rev": "48a1ac9a0aceeea67279b689e446a8dfcdc7033f" "Rev": "68154659ac7ebd81f0e61b14750393f2fbc0eca4"
}, },
{ {
"ImportPath": "github.com/docker/libcompose/lookup", "ImportPath": "github.com/docker/libcompose/lookup",
"Comment": "v0.0.2-ros", "Comment": "v0.0.2-ros-1-g6815465",
"Rev": "48a1ac9a0aceeea67279b689e446a8dfcdc7033f" "Rev": "68154659ac7ebd81f0e61b14750393f2fbc0eca4"
}, },
{ {
"ImportPath": "github.com/docker/libcompose/project", "ImportPath": "github.com/docker/libcompose/project",
"Comment": "v0.0.2-ros", "Comment": "v0.0.2-ros-1-g6815465",
"Rev": "48a1ac9a0aceeea67279b689e446a8dfcdc7033f" "Rev": "68154659ac7ebd81f0e61b14750393f2fbc0eca4"
}, },
{ {
"ImportPath": "github.com/docker/libcompose/utils", "ImportPath": "github.com/docker/libcompose/utils",
"Comment": "v0.0.2-ros", "Comment": "v0.0.2-ros-1-g6815465",
"Rev": "48a1ac9a0aceeea67279b689e446a8dfcdc7033f" "Rev": "68154659ac7ebd81f0e61b14750393f2fbc0eca4"
}, },
{ {
"ImportPath": "github.com/docker/libcontainer/netlink", "ImportPath": "github.com/docker/libcontainer/netlink",

15
Godeps/_workspace/src/github.com/docker/libcompose/docker/service.go generated vendored
View File

@ -59,9 +59,19 @@ func (s *Service) collectContainers() ([]*Container, error) {
for _, container := range containers { for _, container := range containers {
name := container.Labels[NAME.Str()] name := container.Labels[NAME.Str()]
c := NewContainer(client, name, s) c := NewContainer(client, name, s)
if outOfSync, err := c.OutOfSync(imageName); err != nil { if s.context.Rebuild {
outOfSync, err := c.OutOfSync(imageName)
if err != nil {
return nil, err return nil, err
} else if outOfSync && s.context.Rebuild && s.Config().Labels.MapParts()[REBUILD.Str()] != "false" { }
origRebuildLabel := container.Labels[REBUILD.Str()]
newRebuildLabel := s.Config().Labels.MapParts()[REBUILD.Str()]
rebuildLabelChanged := newRebuildLabel != origRebuildLabel
logrus.WithFields(logrus.Fields{
"origRebuildLabel": origRebuildLabel,
"newRebuildLabel": newRebuildLabel,
"rebuildLabelChanged": rebuildLabelChanged}).Debug("Rebuild values")
if origRebuildLabel == "always" || rebuildLabelChanged || origRebuildLabel != "false" && outOfSync {
logrus.Infof("Rebuilding %s", name) logrus.Infof("Rebuilding %s", name)
if _, err := c.Rebuild(imageName); err != nil { if _, err := c.Rebuild(imageName); err != nil {
return nil, err return nil, err
@ -69,6 +79,7 @@ func (s *Service) collectContainers() ([]*Container, error) {
} else if outOfSync { } else if outOfSync {
logrus.Warnf("%s needs rebuilding", name) logrus.Warnf("%s needs rebuilding", name)
} }
}
result = append(result, c) result = append(result, c)
} }