You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/10/28 15:47:26 UTC
[incubator-skywalking] branch bug-fix updated (62a99fb -> 4d21027)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch bug-fix
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 62a99fb Keep service instance register based on UUID, but change name to a meaning string.
add e7526ac Deploy docker (#1834)
add 56fbb0d Update ui (#1835)
add 4d21027 Merge branch 'master' into bug-fix
No new revisions were added by this update.
Summary of changes:
docker/Makefile | 13 +-
docker/README.md | 8 +-
.../resources => docker/config}/application.yml | 2 +-
docker/{snapshot => config}/log4j2.xml | 0
docker/{stack.yml => docker-compose.yml} | 16 +-
docker/{snapshot => oap}/Dockerfile | 5 +-
docker/{snapshot => oap}/docker-entrypoint.sh | 7 +-
docker/{snapshot => oap}/log4j2.xml | 0
docker/{snapshot => ui}/Dockerfile | 9 +-
.../ui/docker-entrypoint.sh | 6 +-
.../logback-spring.xml => docker/ui/logback.xml | 7 +-
kubernetes/oap/{01-service.yml => 00-rbac.yml} | 37 ++-
kubernetes/oap/01-config.yml | 338 +++++++++++++++++++++
kubernetes/oap/01-service.yml | 1 -
kubernetes/oap/02-deployment.yml | 14 +-
skywalking-ui | 2 +-
16 files changed, 421 insertions(+), 44 deletions(-)
copy {oap-server/server-starter/src/main/resources => docker/config}/application.yml (98%)
copy docker/{snapshot => config}/log4j2.xml (100%)
rename docker/{stack.yml => docker-compose.yml} (79%)
copy docker/{snapshot => oap}/Dockerfile (85%)
rename docker/{snapshot => oap}/docker-entrypoint.sh (84%)
rename docker/{snapshot => oap}/log4j2.xml (100%)
rename docker/{snapshot => ui}/Dockerfile (82%)
copy apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/resources/skywalking-plugin.def => docker/ui/docker-entrypoint.sh (88%)
mode change 100644 => 100755
copy apm-webapp/src/main/resources/logback-spring.xml => docker/ui/logback.xml (75%)
copy kubernetes/oap/{01-service.yml => 00-rbac.yml} (65%)
create mode 100644 kubernetes/oap/01-config.yml