Skip to content
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

Refine docker detect mechenism. v5.0.190 v6.0.90 #3758

Merged
merged 5 commits into from
Oct 17, 2023

Conversation

winlinvip
Copy link
Member

@winlinvip winlinvip commented Aug 7, 2023

When using Docker, logs are usually printed to console (stdout and stderr). However, since Docker detection occurs late, after log initialization, the default log output may be incorrect. In Docker, logs may still be written to a file instead of the console as expected.

Additionally, the Dockerfile has been improved with a new environment variable SRS_IN_DOCKER=on to clearly indicate a Docker environment. If automatic Docker detection fails, the configuration will be read, and this variable will correctly inform SRS that it's in a Docker environment.

Lastly, the default configuration values have been improved for Docker environments. By default, SRS_LOG_TANK=console and daemon mode is disabled.


TRANS_BY_GPT4


Co-authored-by: john hondaxiao@tencent.com

@winlinvip
Copy link
Member Author

winlinvip commented Oct 13, 2023

We need to merge into 5 and 6.

TRANS_BY_GPT4

Copy link
Collaborator

@xiaozhihong xiaozhihong left a comment

Choose a reason for hiding this comment

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

ok

@xiaozhihong xiaozhihong changed the title Refine docker detect mechenism. Refine docker detect mechenism. v5.0.190 v6.0.90 Oct 17, 2023
@xiaozhihong xiaozhihong added the RefinedByAI Refined by AI/GPT. label Oct 17, 2023
@xiaozhihong xiaozhihong merged commit a458c9c into ossrs:develop Oct 17, 2023
17 checks passed
xiaozhihong added a commit that referenced this pull request Oct 17, 2023
When using Docker, logs are usually printed to console (stdout and
stderr). However, since Docker detection occurs late, after log
initialization, the default log output may be incorrect. In Docker, logs
may still be written to a file instead of the console as expected.

Additionally, the Dockerfile has been improved with a new environment
variable `SRS_IN_DOCKER=on` to clearly indicate a Docker environment. If
automatic Docker detection fails, the configuration will be read, and
this variable will correctly inform SRS that it's in a Docker
environment.

Lastly, the default configuration values have been improved for Docker
environments. By default, `SRS_LOG_TANK=console` and daemon mode is
disabled.

---------

Co-authored-by: john <hondaxiao@tencent.com>
duiniuluantanqin pushed a commit to duiniuluantanqin/srs that referenced this pull request Oct 27, 2023
When using Docker, logs are usually printed to console (stdout and
stderr). However, since Docker detection occurs late, after log
initialization, the default log output may be incorrect. In Docker, logs
may still be written to a file instead of the console as expected.

Additionally, the Dockerfile has been improved with a new environment
variable `SRS_IN_DOCKER=on` to clearly indicate a Docker environment. If
automatic Docker detection fails, the configuration will be read, and
this variable will correctly inform SRS that it's in a Docker
environment.

Lastly, the default configuration values have been improved for Docker
environments. By default, `SRS_LOG_TANK=console` and daemon mode is
disabled.

---------

Co-authored-by: john <hondaxiao@tencent.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RefinedByAI Refined by AI/GPT. TransByAI Translated by AI/GPT.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants