From b032999f06b3e18036f6777e121093f38a3ce627 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Thu, 11 Apr 2024 09:21:19 +0200 Subject: [PATCH] read COMPOSE_REMOVE_ORPHANS from .env Signed-off-by: Nicolas De Loof --- cmd/compose/up.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/compose/up.go b/cmd/compose/up.go index 7fc0bcaf5e..d9c3541ef9 100644 --- a/cmd/compose/up.go +++ b/cmd/compose/up.go @@ -112,6 +112,9 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service, ex create.pullChanged = cmd.Flags().Changed("pull") create.timeChanged = cmd.Flags().Changed("timeout") up.navigationMenuChanged = cmd.Flags().Changed("menu") + if !cmd.Flags().Changed("remove-orphans") { + create.removeOrphans = utils.StringToBool(os.Getenv(ComposeRemoveOrphans)) + } return validateFlags(&up, &create) }), RunE: p.WithServices(dockerCli, func(ctx context.Context, project *types.Project, services []string) error { @@ -138,8 +141,7 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service, ex flags.BoolVar(&create.Build, "build", false, "Build images before starting containers") flags.BoolVar(&create.noBuild, "no-build", false, "Don't build an image, even if it's policy") flags.StringVar(&create.Pull, "pull", "policy", `Pull image before running ("always"|"missing"|"never")`) - removeOrphans := utils.StringToBool(os.Getenv(ComposeRemoveOrphans)) - flags.BoolVar(&create.removeOrphans, "remove-orphans", removeOrphans, "Remove containers for services not defined in the Compose file") + flags.BoolVar(&create.removeOrphans, "remove-orphans", false, "Remove containers for services not defined in the Compose file") flags.StringArrayVar(&create.scale, "scale", []string{}, "Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present.") flags.BoolVar(&up.noColor, "no-color", false, "Produce monochrome output") flags.BoolVar(&up.noPrefix, "no-log-prefix", false, "Don't print prefix in logs")