Skip to content

Update --compose-file flag description to mention stdin#1222

Merged
silvin-lubecki merged 1 commit into
docker:masterfrom
thaJeztah:its_not_standard_but_its_in
Jul 30, 2018
Merged

Update --compose-file flag description to mention stdin#1222
silvin-lubecki merged 1 commit into
docker:masterfrom
thaJeztah:its_not_standard_but_its_in

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

No description provided.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

I was also looking if we could somehow include information about multiple compose files, but
wasn't sure how to best phrase (and format) that;

diff --git a/cli/command/stack/deploy.go b/cli/command/stack/deploy.go
index 6c083eb2..13e98b9d 100644
--- a/cli/command/stack/deploy.go
+++ b/cli/command/stack/deploy.go
@@ -58,7 +58,8 @@ func newDeployCommand(dockerCli command.Cli, common *commonOptions) *cobra.Comma
        flags.StringVar(&opts.Bundlefile, "bundle-file", "", "Path to a Distributed Application Bundle file")
        flags.SetAnnotation("bundle-file", "experimental", nil)
        flags.SetAnnotation("bundle-file", "swarm", nil)
-       flags.StringSliceVarP(&opts.Composefiles, "compose-file", "c", []string{}, `Path to a Compose file, or "-" to read from stdin`)
+       flags.StringSliceVarP(&opts.Composefiles, "compose-file", "c", []string{}, `Path to a Compose file, or "-" to read from stdin.
+Provide this flag multiple times to merge multiple Compose files.`)
        flags.SetAnnotation("compose-file", "version", []string{"1.25"})
        flags.BoolVar(&opts.SendRegistryAuth, "with-registry-auth", false, "Send registry authentication details to Swarm agents")
        flags.SetAnnotation("with-registry-auth", "swarm", nil)

Copy link
Copy Markdown
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐅

@codecov-io
Copy link
Copy Markdown

codecov-io commented Jul 19, 2018

Codecov Report

Merging #1222 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #1222      +/-   ##
==========================================
+ Coverage   54.25%   54.25%   +<.01%     
==========================================
  Files         268      268              
  Lines       17799    17796       -3     
==========================================
  Hits         9656     9656              
+ Misses       7536     7533       -3     
  Partials      607      607

Copy link
Copy Markdown
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@silvin-lubecki silvin-lubecki merged commit 6cd0e2f into docker:master Jul 30, 2018
@GordonTheTurtle GordonTheTurtle added this to the 18.09.0 milestone Jul 30, 2018
@thaJeztah thaJeztah deleted the its_not_standard_but_its_in branch July 30, 2018 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants