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

Modify the acquisition of container_name for libcompose (#2347)

Browse Source
This commit is contained in:
Mars
2018-05-20 10:24:03 +08:00
committed by niusmallnan
parent 962594589f
commit b5e333cf37
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/github.com/docker/libcompose/docker/service.go generated vendored
View File

@@ -94,15 +94,17 @@ func (s *Service) collectContainers(ctx context.Context) ([]*Container, error) {
numberLabel := container.Labels[labels.NUMBER.Str()]
name := strings.SplitAfter(container.Names[0], "/")
if numberLabel == "" {
result = append(result, NewContainer(client, name[1], 1, s))
result = append(result, NewContainer(client, name[len(name)-1], 1, s))
return result, nil
}
containerNumber, err := strconv.Atoi(numberLabel)
if err != nil {
return nil, err
}
// Compose add "/" before name, so Name[1] will store actaul name.
result = append(result, NewContainer(client, name[1], containerNumber, s))
// Compose add "/" before ordinary container name,
// Compose add "/primary-container-name/" before Linked container name,
// so use Name[len(name)-1] to store actaul name
result = append(result, NewContainer(client, name[len(name)-1], containerNumber, s))
}
return result, nil