Skip to content

clarified logging options in Compose, fixed glaring note formats #3272

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.

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 6 commits into from
May 16, 2017
Merged

clarified logging options in Compose, fixed glaring note formats #3272

merged 6 commits into from
May 16, 2017

Conversation

londoncalling
Copy link
Contributor

@londoncalling londoncalling commented May 15, 2017

Logging options on Compose

Notes and admonitions formats fixes

  • Fixed the most glaring problems with notes formats (double prefix words) in the files immediately relevant to this issue/PR as a result of the original CSS updates for admonitions (which automatically pre-pended a word to multi-line, untagged blockquote)

  • Added a new example to Admonitions topic in test.md

  • We should probably do a global scan of the docset to find any other admonitions which broke because of this one problem (automatically pre-pended words to multi-line, untagged blockquotes), and then further clarify note styles for all use cases, including one-liners and cases of multi note blocks that might benefit from a pre-pended word - this helps avoid stacked notes. See the Compose reference files for examples.

Direct preview links

https://deploy-preview-3272--docker-docs.netlify.com/compose/compose-file/#logging

https://deploy-preview-3272--docker-docs.netlify.com/test/#examples-with-both-prefixed-word-and-icon

https://deploy-preview-3272--docker-docs.netlify.com/compose/env-file/ (per issue #3241)

Related

#3178, #3243 (logging related)
#2795 (original admonitions formats PR)
Fixes #3241, further fixes #3178

Reviewers

@thaJeztah @tgjamin @johndmulhausen @joaofnfernandes @mstanleyjones @FredrikWendt @dnephin

Signed-off-by: Victoria Bialas victoria.bialas@docker.com

Victoria Bialas added 3 commits May 15, 2017 17:46
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
>
>* Only the string form (`build: .`) is allowed - not the object
> form that is allowed in Version 2 and up.
> * Using `build` together with [`image`](#image) is not allowed.
Copy link
Member

Choose a reason for hiding this comment

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

The bullet aligning is a bit wonky here :D

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

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
@fernviridian
Copy link
Contributor

LGTM

Victoria Bialas added 2 commits May 16, 2017 11:38
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
@londoncalling londoncalling merged commit b62449b into docker:master May 16, 2017
@londoncalling londoncalling deleted the logging-in-Compose branch May 17, 2017 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

will environment variables in .env appear in containers? Improve docs on logging options in Compose file reference
3 participants