Skip to content

Clean docker-compose log from output #1330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 4, 2023
Merged

Clean docker-compose log from output #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7403b4
Remove progress information from docker-compose pull
mrodm Jun 27, 2023
5910a4a
Add new variable for pull progress information
mrodm Jun 27, 2023
571fc34
Rename env var in buildkite
mrodm Jun 27, 2023
e8b2a03
Remove unnecesary debug log message
mrodm Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ env:
SETUP_GVM_VERSION: 'v0.5.0' # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
DOCKER_COMPOSE_VERSION: "v2.17.2"
ELASTIC_PACKAGE_COMPOSE_DISABLE_ANSI: "true"
ELASTIC_PACKAGE_COMPOSE_DISABLE_PULL_PROGRESS_INFORMATION: "true"
KIND_VERSION: 'v0.17.0'
K8S_VERSION: 'v1.26.0'

Expand Down
20 changes: 16 additions & 4 deletions internal/compose/compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,19 @@ const (
waitForHealthyInterval = 1 * time.Second
)

var DisableANSIComposeEnv = environment.WithElasticPackagePrefix("COMPOSE_DISABLE_ANSI")
var (
DisableANSIComposeEnv = environment.WithElasticPackagePrefix("COMPOSE_DISABLE_ANSI")
DisablePullProgressInformationEnv = environment.WithElasticPackagePrefix("COMPOSE_DISABLE_PULL_PROGRESS_INFORMATION")
)

// Project represents a Docker Compose project.
type Project struct {
name string
composeFilePaths []string

dockerComposeV1 bool
disableANSI bool
dockerComposeV1 bool
disableANSI bool
disablePullProgressInformation bool
}

// Config represents a Docker Compose configuration file.
Expand Down Expand Up @@ -192,14 +196,19 @@ func NewProject(name string, paths ...string) (*Project, error) {
c.disableANSI = true
}

v, ok = os.LookupEnv(DisablePullProgressInformationEnv)
if ok && strings.ToLower(v) != "false" {
c.disablePullProgressInformation = true
}

return &c, nil
}

// Up brings up a Docker Compose project.
func (p *Project) Up(opts CommandOptions) error {
args := p.baseArgs()
args = append(args, "up")
if p.disableANSI {
if p.disablePullProgressInformation {
args = append(args, "--quiet-pull")
}
args = append(args, opts.ExtraArgs...)
Expand Down Expand Up @@ -277,6 +286,9 @@ func (p *Project) Config(opts CommandOptions) (*Config, error) {
func (p *Project) Pull(opts CommandOptions) error {
args := p.baseArgs()
args = append(args, "pull")
if p.disablePullProgressInformation {
args = append(args, "--quiet")
}
args = append(args, opts.ExtraArgs...)
args = append(args, opts.Services...)

Expand Down
2 changes: 0 additions & 2 deletions internal/stack/compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/elastic/elastic-package/internal/compose"
"github.com/elastic/elastic-package/internal/docker"
"github.com/elastic/elastic-package/internal/install"
"github.com/elastic/elastic-package/internal/logger"
)

type ServiceStatus struct {
Expand Down Expand Up @@ -207,7 +206,6 @@ func dockerComposeStatus() ([]ServiceStatus, error) {
if err != nil {
return nil, err
}
logger.Debugf("Adding Service: \"%v\"", service.Name)
services = append(services, *service)
}

Expand Down