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-docker.git
commit aed0df7563f68aba6a8d15342d338174a356e80e Author: Gao Hongtao <[email protected]> AuthorDate: Thu Sep 12 10:50:30 2019 +0800 Release 6.4.0 --- 6/6.3/oap/docker-entrypoint.sh | 28 ++++++++++ 6/6.4/base/Dockerfile | 97 +++++++++++++++++++++++++++++++++ 6/6.4/compose/docker-compose.yml | 59 ++++++++++++++++++++ 6/6.4/oap/Dockerfile | 43 +++++++++++++++ 6/6.4/oap/README.md | 66 ++++++++++++++++++++++ 6/{6.3 => 6.4}/oap/docker-entrypoint.sh | 28 ++++++++++ 6/6.4/oap/log4j2.xml | 35 ++++++++++++ 6/6.4/ui/Dockerfile | 45 +++++++++++++++ 6/6.4/ui/README.md | 38 +++++++++++++ 6/6.4/ui/docker-entrypoint.sh | 26 +++++++++ 6/6.4/ui/logback.xml | 21 +++++++ 11 files changed, 486 insertions(+) diff --git a/6/6.3/oap/docker-entrypoint.sh b/6/6.3/oap/docker-entrypoint.sh index 931299a..070e7a5 100644 --- a/6/6.3/oap/docker-entrypoint.sh +++ b/6/6.3/oap/docker-entrypoint.sh @@ -34,6 +34,10 @@ cluster: #Retry Policy baseSleepTimeMs: \${SW_CLUSTER_ZK_SLEEP_TIME:1000} # initial amount of time to wait between retries maxRetries: \${SW_CLUSTER_ZK_MAX_RETRIES:3} # max number of times to retry + # Enable ACL + enableACL: \${SW_ZK_ENABLE_ACL:false} # disable ACL in default + schema: \${SW_ZK_SCHEMA:digest} # only support digest schema + expression: \${SW_ZK_EXPRESSION:skywalking:skywalking} EOT } @@ -78,9 +82,23 @@ EOT } generateStorageElastisearch() { +if [[ "$SW_RECEIVER_ZIPKIN_ENABLED" = "true" ]]; then + cat <<EOT >> ${var_application_file} +storage: + zipkin-elasticsearch: +EOT +elif [[ "$SW_RECEIVER_JAEGER_ENABLED" = "true" ]]; then + cat <<EOT >> ${var_application_file} +storage: + jaeger-elasticsearch: +EOT +else cat <<EOT >> ${var_application_file} storage: elasticsearch: +EOT +fi +cat <<EOT >> ${var_application_file} nameSpace: \${SW_NAMESPACE:""} clusterNodes: \${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200} protocol: \${SW_STORAGE_ES_HTTP_PROTOCOL:"http"} @@ -255,6 +273,7 @@ core: - Month # Set a timeout on metrics data. After the timeout has expired, the metrics data will automatically be deleted. enableDataKeeperExecutor: \${SW_CORE_ENABLE_DATA_KEEPER_EXECUTOR:true} # Turn it off then automatically metrics data delete will be close. + dataKeeperExecutePeriod: \${SW_CORE_DATA_KEEPER_EXECUTE_PERIOD:5} # How often the data keeper executor runs periodically, unit is minute recordDataTTL: \${SW_CORE_RECORD_DATA_TTL:90} # Unit is minute minuteMetricsDataTTL: \${SW_CORE_MINUTE_METRIC_DATA_TTL:90} # Unit is minute hourMetricsDataTTL: \${SW_CORE_HOUR_METRIC_DATA_TTL:36} # Unit is hour @@ -275,6 +294,15 @@ EOT cat <<EOT >> ${var_application_file} receiver-sharing-server: default: + restHost: \${SW_RECEIVER_SHARING_REST_HOST:0.0.0.O} + restPort: \${SW_RECEIVER_SHARING_REST_PORT:0} + restContextPath: \${SW_RECEIVER_SHARING_REST_CONTEXT_PATH:/} + gRPCHost: \${SW_RECEIVER_SHARING_GRPC_HOST:0.0.0.O} + gRPCPort: \${SW_RECEIVER_SHARING_GRPC_PORT:0} + maxConcurrentCallsPerConnection: \${SW_RECEIVER_SHARING_MAX_CONCURRENT_CALL:0} + maxMessageSize: \${SW_RECEIVER_SHARING_MAX_MESSAGE_SIZE:0} + gRPCThreadPoolSize: \${SW_RECEIVER_SHARING_GRPC_THREAD_POOL_SIZE:0} + gRPCThreadPoolQueueSize: \${SW_RECEIVER_SHARING_GRPC_THREAD_POOL_QUEUE_SIZE:0} receiver-register: default: receiver-trace: diff --git a/6/6.4/base/Dockerfile b/6/6.4/base/Dockerfile new file mode 100644 index 0000000..2c43d00 --- /dev/null +++ b/6/6.4/base/Dockerfile @@ -0,0 +1,97 @@ +# 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. + +FROM openjdk:8-jre-alpine AS build + +LABEL maintainer="[email protected]" + +# Install required packages +RUN apk add --no-cache \ + bash \ + python \ + su-exec + + +ENV SKYWALKING_HOME=/skywalking +RUN mkdir -p "${SKYWALKING_HOME}" +WORKDIR $SKYWALKING_HOME + +ENV GPG_KEYS A968F6905E0ACB59E5B24C15D3D9CD50820184C2 B0801BC746F965029A1338072EF5026E70A55777 D360AB2AB20B28403270E2CBE8608938DB25E06B +ENV SKYWALKING_VERSION=6.4.0 +ENV SKYWALKING_SHA512 2da579d664f991e2b578f61f2e72c6edd6929ed057edeaa137049bfa59de32313b11b1497e28831ce7ec4e33db2bf3b6ea2ec70398237a0dd1de064343c93a99 + +ENV SKYWALKING_TGZ_URLS \ + https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz \ + # if the version is outdated, we might have to pull from the dist/archive :/ + https://www-us.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz \ + https://www.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz \ + https://archive.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz + +ENV SKYWALKING_ASC_URLS \ + https://www.apache.org/dyn/closer.cgi?action=download&filename=skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz.asc \ + # if the version is outdated, we might have to pull from the dist/archive :/ + https://www-us.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz.asc \ + https://www.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz.asc \ + https://archive.apache.org/dist/skywalking/$SKYWALKING_VERSION/apache-skywalking-apm-$SKYWALKING_VERSION.tar.gz.asc + +RUN set -eux; \ + \ + apk add --no-cache --virtual .fetch-deps \ + gnupg \ + \ + ca-certificates \ + openssl \ + ; \ + \ + export GNUPGHOME="$(mktemp -d)"; \ + for key in $GPG_KEYS; do \ + gpg --batch --keyserver pgp.surfnet.nl --recv-keys "$key"; \ + done; \ + \ + success=; \ + for url in $SKYWALKING_TGZ_URLS; do \ + if wget -O skywalking.tar.gz "$url"; then \ + success=1; \ + break; \ + fi; \ + done; \ + [ -n "$success" ]; \ + \ + echo "$SKYWALKING_SHA512 *skywalking.tar.gz" | sha512sum -c -; \ + \ + success=; \ + for url in $SKYWALKING_ASC_URLS; do \ + if wget -O skywalking.tar.gz.asc "$url"; then \ + success=1; \ + break; \ + fi; \ + done; \ + [ -n "$success" ]; \ + \ + gpg --batch --verify skywalking.tar.gz.asc skywalking.tar.gz; \ + tar -xvf skywalking.tar.gz --strip-components=1; \ + rm -rf bin/; \ + rm skywalking.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ + rm -rf "$GNUPGHOME"; \ + apk del .fetch-deps + +FROM openjdk:8-jre-alpine + +COPY --from=build /skywalking /skywalking + +RUN apk add --no-cache \ + bash \ No newline at end of file diff --git a/6/6.4/compose/docker-compose.yml b/6/6.4/compose/docker-compose.yml new file mode 100644 index 0000000..a7a3a97 --- /dev/null +++ b/6/6.4/compose/docker-compose.yml @@ -0,0 +1,59 @@ +# 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. + +version: '3.3' +services: + elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:6.8.1 + container_name: elasticsearch + restart: always + ports: + - 9200:9200 + - 9300:9300 + environment: + - discovery.type=single-node + - bootstrap.memory_lock=true + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + ulimits: + memlock: + soft: -1 + hard: -1 + oap: + image: apache/skywalking-oap-server:6.3.0 + container_name: oap + depends_on: + - elasticsearch + links: + - elasticsearch + restart: always + ports: + - 11800:11800 + - 12800:12800 + environment: + SW_STORAGE: elasticsearch + SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200 + ui: + image: apache/skywalking-ui:6.3.0 + container_name: ui + depends_on: + - oap + links: + - oap + restart: always + ports: + - 8080:8080 + environment: + SW_OAP_ADDRESS: oap:12800 diff --git a/6/6.4/oap/Dockerfile b/6/6.4/oap/Dockerfile new file mode 100644 index 0000000..c5d2cf9 --- /dev/null +++ b/6/6.4/oap/Dockerfile @@ -0,0 +1,43 @@ +# 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. + +FROM apache/skywalking-base:6.3.0 AS build + +WORKDIR skywalking + +RUN set -eux; \ + rm -rf "config/log4j2.xml"; \ + rm -rf "webapp"; rm -rf "agent"; + +COPY log4j2.xml config/ +COPY docker-entrypoint.sh . + +FROM openjdk:8-jre-alpine + +ENV JAVA_OPTS=" -Xms256M " + +LABEL maintainer="[email protected]" + +COPY --from=build /skywalking /skywalking + +WORKDIR skywalking + +RUN apk add --no-cache \ + bash + +EXPOSE 12800 11800 1234 + +ENTRYPOINT ["bash", "docker-entrypoint.sh"] \ No newline at end of file diff --git a/6/6.4/oap/README.md b/6/6.4/oap/README.md new file mode 100644 index 0000000..c062478 --- /dev/null +++ b/6/6.4/oap/README.md @@ -0,0 +1,66 @@ +# Apache SkyWalking OAP Server Docker Files + +<img src="http://skywalking.apache.org/assets/logo.svg" alt="Sky Walking logo" height="90px" align="right" /> + +**SkyWalking**: an APM(application performance monitor) system, especially designed for +microservices, cloud native and container-based (Docker, Kubernetes, Mesos) architectures. + +# How to use this image + +## Start a `standlone` container with `H2` storage + +``` +$ docker run --name oap --restart always -d apache/skywalking-oap-server:6.3.0 +``` + +## Start a `standlone` container with `elasticsearch` storage whose address is `elasticsearch:9200` + +``` +$ docker run --name oap --restart always -d -e SW_STORAGE=elasticsearch -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 apache/skywalking-oap-server:6.3.0 +``` + +# Configuration + +We could set up environment variables to configure this image. Most of them are defined in [backend-setup](https://github.com/apache/skywalking/blob/v6.3.0/docs/en/setup/backend/backend-setup.md), but Apache SkyWalking Docker Image adds extra environment variables to help the user to compose it properly. The details are located in [docker-entrypoint.sh](docker-entrypoint.sh) + +## SW_CLUSTER +Default value is `standalone`, avaliable values are: + + - `standlone`, If set this value, all enviroment variables of `cluster.standlone` in `application.yml` are avaliable. + - `zookeeper`, If set this value, all enviroment variables of `cluster.zookeeper` in `application.yml` are avaliable. + - `kubernetes`, If set this value, all enviroment variables of `cluster.kubernetes` in `application.yml` are avaliable. + - `consul`, If set this value, all enviroment variables of `cluster.consul` in `application.yml` are avaliable. + - `etcd`, If set this value, all enviroment variables of `cluster.etcd` in `application.yml` are avaliable. + - `nacos`, If set this value, all enviroment variables of `cluster.nacos` in `application.yml` are avaliable. + +## SW_STORAGE +Default value is `h2`, avaliable values are: + + - `h2`, If set this value, all enviroment variables of `storage.h2` in `application.yml` are avaliable. + - `elasticsearch`, If set this value, all enviroment variables of `stroage.elasticsearch` in `application.yml` are avaliable. + - `mysql`, If set this value, all enviroment variables of `stroage.mysql` in `application.yml` are avaliable. + + ## SW_CONFIGURATION +Default value is `none`, avaliable values are: + + - `apollo`, If set this value, all enviroment variables of `configuration.apollo` in `application.yml` are avaliable. + - `nacos`, If set this value, all enviroment variables of `configuration.nacos` in `application.yml` are avaliable. + - `zookeeper`, If set this value, all enviroment variables of `configuration.zookeeper` in `application.yml` are avaliable. + +## SW_TELEMETRY +Default value is `none`, avaliable values are: + + - `none`, If set this value, all enviroment variables of `telemetry.none` in `application.yml` are avaliable. + - `prometheus`, If set this value, all enviroment variables of `configuration.prometheus` in `application.yml` are avaliable. + - `so11y`, If set this value, all enviroment variables of `configuration.so11y` in `application.yml` are avaliable. + +## XXX_ENABLED + +There are also some other configuration switchers to extend default configuration, they also have a suffix `_ENABLED`. + + - `SW_RECEIVER_ZIPKIN_ENABLED` turns on/off zipkin receiver + - `SW_RECEIVER_JAEGER_ENABLED` turns on/off jaeger receiver + - `SW_EXPORTER_ENABLED` turns on/off exporter + +# License +[Apache 2.0 License.](/LICENSE) diff --git a/6/6.3/oap/docker-entrypoint.sh b/6/6.4/oap/docker-entrypoint.sh similarity index 91% copy from 6/6.3/oap/docker-entrypoint.sh copy to 6/6.4/oap/docker-entrypoint.sh index 931299a..070e7a5 100644 --- a/6/6.3/oap/docker-entrypoint.sh +++ b/6/6.4/oap/docker-entrypoint.sh @@ -34,6 +34,10 @@ cluster: #Retry Policy baseSleepTimeMs: \${SW_CLUSTER_ZK_SLEEP_TIME:1000} # initial amount of time to wait between retries maxRetries: \${SW_CLUSTER_ZK_MAX_RETRIES:3} # max number of times to retry + # Enable ACL + enableACL: \${SW_ZK_ENABLE_ACL:false} # disable ACL in default + schema: \${SW_ZK_SCHEMA:digest} # only support digest schema + expression: \${SW_ZK_EXPRESSION:skywalking:skywalking} EOT } @@ -78,9 +82,23 @@ EOT } generateStorageElastisearch() { +if [[ "$SW_RECEIVER_ZIPKIN_ENABLED" = "true" ]]; then + cat <<EOT >> ${var_application_file} +storage: + zipkin-elasticsearch: +EOT +elif [[ "$SW_RECEIVER_JAEGER_ENABLED" = "true" ]]; then + cat <<EOT >> ${var_application_file} +storage: + jaeger-elasticsearch: +EOT +else cat <<EOT >> ${var_application_file} storage: elasticsearch: +EOT +fi +cat <<EOT >> ${var_application_file} nameSpace: \${SW_NAMESPACE:""} clusterNodes: \${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200} protocol: \${SW_STORAGE_ES_HTTP_PROTOCOL:"http"} @@ -255,6 +273,7 @@ core: - Month # Set a timeout on metrics data. After the timeout has expired, the metrics data will automatically be deleted. enableDataKeeperExecutor: \${SW_CORE_ENABLE_DATA_KEEPER_EXECUTOR:true} # Turn it off then automatically metrics data delete will be close. + dataKeeperExecutePeriod: \${SW_CORE_DATA_KEEPER_EXECUTE_PERIOD:5} # How often the data keeper executor runs periodically, unit is minute recordDataTTL: \${SW_CORE_RECORD_DATA_TTL:90} # Unit is minute minuteMetricsDataTTL: \${SW_CORE_MINUTE_METRIC_DATA_TTL:90} # Unit is minute hourMetricsDataTTL: \${SW_CORE_HOUR_METRIC_DATA_TTL:36} # Unit is hour @@ -275,6 +294,15 @@ EOT cat <<EOT >> ${var_application_file} receiver-sharing-server: default: + restHost: \${SW_RECEIVER_SHARING_REST_HOST:0.0.0.O} + restPort: \${SW_RECEIVER_SHARING_REST_PORT:0} + restContextPath: \${SW_RECEIVER_SHARING_REST_CONTEXT_PATH:/} + gRPCHost: \${SW_RECEIVER_SHARING_GRPC_HOST:0.0.0.O} + gRPCPort: \${SW_RECEIVER_SHARING_GRPC_PORT:0} + maxConcurrentCallsPerConnection: \${SW_RECEIVER_SHARING_MAX_CONCURRENT_CALL:0} + maxMessageSize: \${SW_RECEIVER_SHARING_MAX_MESSAGE_SIZE:0} + gRPCThreadPoolSize: \${SW_RECEIVER_SHARING_GRPC_THREAD_POOL_SIZE:0} + gRPCThreadPoolQueueSize: \${SW_RECEIVER_SHARING_GRPC_THREAD_POOL_QUEUE_SIZE:0} receiver-register: default: receiver-trace: diff --git a/6/6.4/oap/log4j2.xml b/6/6.4/oap/log4j2.xml new file mode 100644 index 0000000..b1f1818 --- /dev/null +++ b/6/6.4/oap/log4j2.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ 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. + ~ + --> + +<Configuration status="INFO"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/> + </Console> + </Appenders> + <Loggers> + <logger name="org.eclipse.jetty" level="INFO"/> + <logger name="org.apache.zookeeper" level="INFO"/> + <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/> + <logger name="io.grpc.netty" level="INFO"/> + <Root level="INFO"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/6/6.4/ui/Dockerfile b/6/6.4/ui/Dockerfile new file mode 100644 index 0000000..110f296 --- /dev/null +++ b/6/6.4/ui/Dockerfile @@ -0,0 +1,45 @@ +# 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. + +FROM apache/skywalking-base:6.3.0 AS build + +WORKDIR skywalking + +RUN set -eux; \ + rm -rf "config"; rm -rf "oap-libs"; \ + rm -rf "agent"; + +COPY docker-entrypoint.sh . +COPY logback.xml webapp/ + +FROM openjdk:8-jre-alpine + +ENV JAVA_OPTS=" -Xms256M " \ + SW_OAP_ADDRESS="oap:12800" \ + SW_TIMEOUT="20000" + +LABEL maintainer="[email protected]" + +COPY --from=build /skywalking /skywalking + +WORKDIR skywalking + +RUN apk add --no-cache \ + bash + +EXPOSE 8080 + +ENTRYPOINT ["bash", "docker-entrypoint.sh"] \ No newline at end of file diff --git a/6/6.4/ui/README.md b/6/6.4/ui/README.md new file mode 100644 index 0000000..b902d57 --- /dev/null +++ b/6/6.4/ui/README.md @@ -0,0 +1,38 @@ +# Apache SkyWalking UI docker file + +**Docker images are not official ASF releases but provided for convenience. Recommended usage is always to build the source** + +<img src="http://skywalking.apache.org/assets/logo.svg" alt="Sky Walking logo" height="90px" align="right" /> + +**SkyWalking**: an APM(application performance monitor) system, especially designed for +microservices, cloud native and container-based (Docker, Kubernetes, Mesos) architectures. + +[](https://github.com/apache/incubator-skywalking) +[](https://twitter.com/AsfSkyWalking) + +You could find docker file at [here](https://github.com/apache/incubator-skywalking-docker) + +This image would start up SkyWalking UI only. + +[SkyWalking K8s deployment scripts](https://github.com/apache/incubator-skywalking-kubernetes) use this image by default. + +# How to use this image + +## Start a container to connect oap server whose address is `oap:12800` + +``` +$ docker run --name oap --restart always -d -e SW_OAP_ADDRESS=oap:12800 apache/skywalking-ui:6.3.0 +``` + +# Configuration + +We could set up environment variables to configure this image. + +## SW_OAP_ADDRESS +The address of OAP server. Default value is `127.0.0.1:12800`. + +## SW_TIMEOUT +Reading timeout. Default value is `20000`(millisecond). + +# License +[Apache 2.0 License.](/LICENSE) \ No newline at end of file diff --git a/6/6.4/ui/docker-entrypoint.sh b/6/6.4/ui/docker-entrypoint.sh new file mode 100644 index 0000000..6771e22 --- /dev/null +++ b/6/6.4/ui/docker-entrypoint.sh @@ -0,0 +1,26 @@ +# 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. + +#!/bin/bash + +set -e + +export LOGGING_CONFIG="webapp/logback.xml" + +[[ ! -z "$SW_OAP_ADDRESS" ]] && export COLLECTOR_RIBBON_LISTOFSERVERS=${SW_OAP_ADDRESS} && echo "COLLECTOR_RIBBON_LISTOFSERVERS=$COLLECTOR_RIBBON_LISTOFSERVERS" +[[ ! -z "$SW_TIMEOUT" ]] && export COLLECTOR_RIBBON_READTIMEOUT=${SW_TIMEOUT} && echo "COLLECTOR_RIBBON_READTIMEOUT=$COLLECTOR_RIBBON_READTIMEOUT" + +exec java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -jar webapp/skywalking-webapp.jar "$@" diff --git a/6/6.4/ui/logback.xml b/6/6.4/ui/logback.xml new file mode 100644 index 0000000..834036d --- /dev/null +++ b/6/6.4/ui/logback.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ 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. + ~ + --> +<configuration> + <include resource="org/springframework/boot/logging/logback/base.xml" /> +</configuration> \ No newline at end of file
