Skip to content

Cli fixups#30804

Merged
thaJeztah merged 3 commits intomoby:masterfrom
mdlinville:cli_fixups
Feb 9, 2017
Merged

Cli fixups#30804
thaJeztah merged 3 commits intomoby:masterfrom
mdlinville:cli_fixups

Conversation

@mdlinville
Copy link
Contributor

Two smaller commits address docker/docs#1451 and remove an unused GIF from docs/reference/commandline/.

The big commit standardizes formatting of CLI reference commands:

  • Command name should be a H1
  • Only Description, Examples, and Related Commands should be H2
  • Changed 'Related information' heading to 'Related commands' since 99% it is only linking commands
  • Added some examples where relevant

These changes will enable us to automate use of the CLI reference files in generated YAML output.

Cute alligators

cc/ @FrenchBen

Copy link
Member

Choose a reason for hiding this comment

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

I wonder console is preferred over bash for better rendering, but it can be other PR.

Copy link
Member

Choose a reason for hiding this comment

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

Highlighting will probably improve once we can do docker/docs#1021, unfortunately that's currently blocked by changes upstream

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Either bash is a synonym for console or the other way around. They are equivalent. We have pretty much standardized on bash over time.

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

thanks! left some comments

Copy link
Member

Choose a reason for hiding this comment

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

Perhaps we should change this to "use a custom parent cgroup". The "optional" seems to refer to the fact that this flag is not required; that applies to most flags, so is irrelevant

Copy link
Member

Choose a reason for hiding this comment

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

should be JSON here

Copy link
Member

Choose a reason for hiding this comment

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

😢 atom still not fixed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct. It screws up the formatting in the whole rest of the file. :(

Copy link
Member

Choose a reason for hiding this comment

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

For a follow up we should consider making this a table, and describe when each event is fired / a short description

Copy link
Member

Choose a reason for hiding this comment

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

Actually, this only removes the "link" (if it's a legacy link on the default bridge network; the same may not apply when using --link on a custom network)

Copy link
Member

Choose a reason for hiding this comment

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

For a follow up; we may want to express the dangers of using -f, as it not only forces removal of a container is still running, but also can result in layers being left behind if they fail to be removed

Copy link
Member

Choose a reason for hiding this comment

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

Can you check this to be sure (per our discussion)

@mdlinville
Copy link
Contributor Author

Addressed feedback so far, except for follow-up issues.

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, but needs a rebase

Misty Stanley-Jones added 3 commits February 8, 2017 16:38
Signed-off-by: Misty Stanley-Jones <[email protected]>
Command name should be a H1

Only Description, Examples, and Related Commands should be H2

Changed 'Related information' heading to 'Related commands' since 99% it is only linking commands

Added some examples where relevant

Signed-off-by: Misty Stanley-Jones <[email protected]>
@mdlinville
Copy link
Contributor Author

Rebase complete, @thaJeztah

@thaJeztah
Copy link
Member

Let's go!

@thaJeztah thaJeztah merged commit 40dbbd3 into moby:master Feb 9, 2017
@mdlinville mdlinville mentioned this pull request Feb 9, 2017
@thaJeztah thaJeztah modified the milestones: 17.03.0, 1.13.1 Feb 18, 2017
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Feb 21, 2017
Cli fixups
(cherry picked from commit 40dbbd3)

Signed-off-by: Sebastiaan van Stijn <[email protected]>
tiborvass pushed a commit to tiborvass/docker that referenced this pull request Mar 15, 2017
Cli fixups
(cherry picked from commit 40dbbd3)

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit c611906)
Signed-off-by: Tibor Vass <[email protected]>
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.

4 participants