rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-03 18:16:13 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trash.conf
View File

@ -14,7 +14,7 @@ github.com/docker/docker b40c87254f587af7cad8e8128f061a2a7f367343 https://github
github.com/docker/engine-api v0.3.3 github.com/docker/engine-api v0.3.3
github.com/docker/go-connections v0.2.0 github.com/docker/go-connections v0.2.0
github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3 github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
github.com/docker/libcompose b9f88a071f78d49293a8f31ae0d2e339085fd0d7 https://github.com/rancher/libcompose.git github.com/docker/libcompose c598536dc130c03c419d74f4c66c9dd0f728338d https://github.com/wchao1241/libcompose.git
github.com/docker/libnetwork v0.5.6 github.com/docker/libnetwork v0.5.6
github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
github.com/docker/machine 4a8e93ac9bc2ced1c3bc4a43c03fdaa1c2749205 github.com/docker/machine 4a8e93ac9bc2ced1c3bc4a43c03fdaa1c2749205

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()] numberLabel := container.Labels[labels.NUMBER.Str()]
name := strings.SplitAfter(container.Names[0], "/") name := strings.SplitAfter(container.Names[0], "/")
if numberLabel == "" { 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 return result, nil
} }
containerNumber, err := strconv.Atoi(numberLabel) containerNumber, err := strconv.Atoi(numberLabel)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Compose add "/" before name, so Name[1] will store actaul name. // Compose add "/" before ordinary container name,
result = append(result, NewContainer(client, name[1], containerNumber, s)) // 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 return result, nil