[skywalking] branch master updated: Fix docker-entrypoint.sh error (#4812)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng 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 7b9dfa2  Fix docker-entrypoint.sh error (#4812)
7b9dfa2 is described below

commit 7b9dfa23993ab4350567ff53407115cb37200d78
Author: qiyang <15...@163.com>
AuthorDate: Fri May 22 21:06:32 2020 +0800

    Fix docker-entrypoint.sh error (#4812)
    
    Co-authored-by: 亓杨 <qi...@enmonster.com>
---
 docker/oap/docker-entrypoint.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh
index 96cfb6d..7007d46 100755
--- a/docker/oap/docker-entrypoint.sh
+++ b/docker/oap/docker-entrypoint.sh
@@ -28,7 +28,9 @@ EXT_LIB_DIR=/skywalking/ext-libs
 EXT_CONFIG_DIR=/skywalking/ext-config
 
 # Override configuration files
-cp -vfR ${EXT_CONFIG_DIR}/ config/
+if [ "$(ls -A $EXT_CONFIG_DIR)" ]; then
+  cp -vfR ${EXT_CONFIG_DIR}/* config/
+fi
 
 CLASSPATH="config:$CLASSPATH"
 for i in oap-libs/*.jar