This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push: new fff3378 [BugFix] Docker so11y cannot be disabled (#4471) fff3378 is described below commit fff3378d4041127689447a88c32a357390b4ec17 Author: kezhenxu94 <kezhenx...@apache.org> AuthorDate: Mon Mar 9 20:42:26 2020 +0800 [BugFix] Docker so11y cannot be disabled (#4471) ### Motivation: This patch fixes the bug that there's no chance to disable the so11y in docker container. ### Modifications: - Remove the default so11y section, and only add it when the environment variable exists. ### Result: - Users can disable so11y by leaving the `SW_TELEMETRY` empty or set it to `none` --- docker/oap-es7/docker-entrypoint.sh | 2 -- docker/oap/docker-entrypoint.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/docker/oap-es7/docker-entrypoint.sh b/docker/oap-es7/docker-entrypoint.sh index 54f508a..87cc9b1 100755 --- a/docker/oap-es7/docker-entrypoint.sh +++ b/docker/oap-es7/docker-entrypoint.sh @@ -384,8 +384,6 @@ receiver-jvm: default: receiver-clr: default: -receiver-so11y: - default: service-mesh: default: bufferPath: \${SW_SERVICE_MESH_BUFFER_PATH:../mesh-buffer/} # Path to trace buffer files, suggest to use absolute path diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh index 8e46901..36f8928 100755 --- a/docker/oap/docker-entrypoint.sh +++ b/docker/oap/docker-entrypoint.sh @@ -385,8 +385,6 @@ receiver-jvm: default: receiver-clr: default: -receiver-so11y: - default: receiver-profile: default: service-mesh: