This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a commit to branch docker/ext in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 0b14e51050416d68fb3d21c2e08641d75b593fa6 Author: Gao Hongtao <[email protected]> AuthorDate: Fri Nov 22 12:27:06 2019 +0800 Add ext lib and ext config --- .github/workflows/docker-ci.yaml | 31 +++++++++++++++++++++++++++++++ docker/oap/docker-entrypoint.sh | 11 +++++++++++ 2 files changed, 42 insertions(+) diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml new file mode 100644 index 0000000..23d5dc1 --- /dev/null +++ b/.github/workflows/docker-ci.yaml @@ -0,0 +1,31 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: docker-ci + +on: [push] +env: + SCRIPTS_DIR: ./test/scripts + LOG_DIR: /tmp/skywalking +jobs: + build: + runs-on: ubuntu-16.04 + steps: + - uses: actions/checkout@v1 + - name: Build docker image + run: make docker + - name: Start oap + run: docker run --name oap skywalking/oap diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh index 2ae3607..c18cd1a 100755 --- a/docker/oap/docker-entrypoint.sh +++ b/docker/oap/docker-entrypoint.sh @@ -425,7 +425,14 @@ SW_CLUSTER=${SW_CLUSTER:-standalone} SW_STORAGE=${SW_STORAGE:-h2} SW_CONFIGURATION=${SW_CONFIGURATION:-none} SW_TELEMETRY=${SW_TELEMETRY:-none} +EXT_LIB_DIR=/skywalking/ext-libs +EXT_CONFIG_DIR=/skywalking/ext-config +# If user wants to override application.yml, the one generated by docker-entrypoint.sh should be ignored. +[[ -f ${EXT_CONFIG_DIR}/application.yml ]] && SW_L0AD_CONFIG_FILE_FROM_VOLUME=true + +# Override configuration files +cp -vfR ${EXT_CONFIG_DIR}/ config/ if [[ -z "$SW_L0AD_CONFIG_FILE_FROM_VOLUME" ]] || [[ "$SW_L0AD_CONFIG_FILE_FROM_VOLUME" != "true" ]]; then generateApplicationYaml echo "Generated application.yml" @@ -439,6 +446,10 @@ for i in oap-libs/*.jar do CLASSPATH="$i:$CLASSPATH" done +for i in ${EXT_LIB_DIR}/*.jar +do + CLASSPATH="$i:$CLASSPATH" +done set -ex exec java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
