[skywalking-docker] 22/45: Merge branch 'master' of https://github.com/apache/skywalking-docker

[wusheng]

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 2d4d40227ff86b12f26d7642641283eb5b4ca796
Merge: d9b08ef e38e09c
Author: Gao Hongtao <hanahm...@gmail.com>
AuthorDate: Wed Jul 3 18:21:14 2019 +0800

    Merge branch 'master' of https://github.com/apache/skywalking-docker

 6/6.1/oap/README.md |  1 +
 6/6.1/ui/README.md  | 21 +++++++--------------
 6/6.2/ui/README.md  |  7 +++++--
 README.md           |  7 ++++++-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --cc 6/6.1/oap/README.md
index 1df96a0,83e71dc..d819117
--- a/6/6.1/oap/README.md
+++ b/6/6.1/oap/README.md
@@@ -32,9 -32,9 +32,10 @@@ Default value is `standalone`, avaliabl
   - `consul`, If set this value, all enviroment variables of `cluster.consul` 
in `application.yml` are avaliable.
   
  ## SW_STORAGE
 -Default value is `H2`, avaliable values are:
++<<<<<<< HEAD
 +Default value is `h2`, avaliable values are:
  
 - - `H2`, If set this value, all enviroment variables of `storage.h2` in 
`application.yml` are avaliable.
 + - `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.
   
diff --cc 6/6.1/ui/README.md
index 87a6aa1,f8caf51..16ad929
--- a/6/6.1/ui/README.md
+++ b/6/6.1/ui/README.md
@@@ -32,4 -21,8 +21,8 @@@ We could set up environment variables t
  The address of OAP server. Default value is `127.0.0.1:12800`.
   
  ## SW_TIMEOUT
- Reading timeout. Default value is `20000`(millisecond).
++
+ Reading timeout. Default value is `20000`(millisecond).
+ 
+ # License
+ [Apache 2.0 License.](/LICENSE)
 -
diff --cc 6/6.2/ui/README.md
index c11377f,0000000..1941256
mode 100644,000000..100644
--- a/6/6.2/ui/README.md
+++ b/6/6.2/ui/README.md
@@@ -1,35 -1,0 +1,38 @@@
- # Apache SkyWalking UI image
++# 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.
 +
 +[![GitHub 
stars](https://img.shields.io/github/stars/apache/incubator-skywalking.svg?style=for-the-badge&label=Stars&logo=github)](https://github.com/apache/incubator-skywalking)
 +[![Twitter 
Follow](https://img.shields.io/twitter/follow/asfskywalking.svg?style=for-the-badge&label=Follow&logo=twitter)](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.2.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).
++Reading timeout. Default value is `20000`(millisecond).
++
++# License
++[Apache 2.0 License.](/LICENSE)