mroot/lazydocker
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazydocker.git synced 2026-07-23 07:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use one-off label to determine whether a container is bound to a service

Browse source
This commit is contained in:
Jesse Duffield 2019-06-23 21:15:49 +10:00
parent f34c7b9058
commit b9bf469695
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/commands/container.go
View file

@ -22,8 +22,10 @@ import (
type Container struct {
Name string
ServiceName string
ServiceID string
ContainerNumber string // might make this an int in the future if need be
// OneOff tells us if the container is just a job container or is actually bound to the service
OneOff bool
ProjectName string
ID string
Container types.Container

7
pkg/commands/docker.go
View file

@ -244,7 +244,7 @@ func (c *DockerCommand) assignContainersToServices(containers []*Container, serv
L:
for _, service := range services {
for _, container := range containers {
if container.ServiceID != "" && container.ServiceID == service.ID {
if !container.OneOff && container.ServiceName == service.Name {
service.Container = container
continue L
}
@ -253,12 +253,13 @@ L:
}
}
// obtainStandaloneContainers returns standalone containers. Standalone containers are containers which are either one-off containers, or whose service is not part of this docker-compose context
func (c *DockerCommand) obtainStandaloneContainers(containers []*Container, services []*Service) []*Container {
standaloneContainers := []*Container{}
L:
for _, container := range containers {
for _, service := range services {
if container.ServiceID != "" && container.ServiceID == service.ID {
if !container.OneOff && container.ServiceName != "" && container.ServiceName == service.Name {
continue L
}
}
@ -313,9 +314,9 @@ func (c *DockerCommand) GetContainers() ([]*Container, error) {
newContainer.Name = strings.TrimLeft(container.Names[0], "/")
}
newContainer.ServiceName = container.Labels["com.docker.compose.service"]
newContainer.ServiceID = container.Labels["com.docker.compose.config-hash"]
newContainer.ProjectName = container.Labels["com.docker.compose.project"]
newContainer.ContainerNumber = container.Labels["com.docker.compose.container"]
newContainer.OneOff = container.Labels["com.docker.compose.oneoff"] == "True"
ownContainers[i] = newContainer
}