tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Filter out one_off containers on compose logs

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-02-05 11:15:43 +01:00
parent f433fb89d1
commit a1bc5c721d
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
local/compose/labels.go
View File

@ -18,6 +18,8 @@ package compose
import ( import (
"fmt" "fmt"
"strconv"
"strings"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
@ -44,6 +46,10 @@ func projectFilter(projectName string) filters.KeyValuePair {
return filters.Arg("label", fmt.Sprintf("%s=%s", projectLabel, projectName)) return filters.Arg("label", fmt.Sprintf("%s=%s", projectLabel, projectName))
} }
func oneOffFilter(oneOff bool) filters.KeyValuePair {
return filters.Arg("label", fmt.Sprintf("%s=%s", oneoffLabel, strings.Title(strconv.FormatBool(oneOff))))
}
func serviceFilter(serviceName string) filters.KeyValuePair { func serviceFilter(serviceName string) filters.KeyValuePair {
return filters.Arg("label", fmt.Sprintf("%s=%s", serviceLabel, serviceName)) return filters.Arg("label", fmt.Sprintf("%s=%s", serviceLabel, serviceName))
} }

3
local/compose/logs.go
View File

@ -33,6 +33,7 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer
list, err := s.apiClient.ContainerList(ctx, types.ContainerListOptions{ list, err := s.apiClient.ContainerList(ctx, types.ContainerListOptions{
Filters: filters.NewArgs( Filters: filters.NewArgs(
projectFilter(projectName), projectFilter(projectName),
oneOffFilter(false),
), ),
All: true, All: true,
}) })
@ -72,7 +73,7 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer
if err != nil { if err != nil {
return err return err
} }
w := getWriter(service, container.ID, consumer) w := getWriter(service, container.Name[1:], consumer)
if container.Config.Tty { if container.Config.Tty {
_, err = io.Copy(w, r) _, err = io.Copy(w, r)
} else { } else {