Commit e7526acc authored by Gao Hongtao's avatar Gao Hongtao Committed by 吴晟
Browse files

Deploy docker (#1834) 

* Update submodule skywalking-ui

* Refactor kubernetes config

* Add ui image
parent 8cd327d8

docker/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -14,9 +14,16 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



snapshot:

	cd snapshot; \

oap:

	cd oap; \

	cp ../../dist/apache-skywalking-apm-incubating.tar.gz ./ ; \

	docker build -t skywalking/oap:latest .



.PHONY: snapshot
 
 No newline at end of file
 
ui:

	cd ui; \

	cp ../../dist/apache-skywalking-apm-incubating.tar.gz ./ ; \

	docker build -t skywalking/ui:latest .

	

build: oap ui



.PHONY: oap ui
 
 No newline at end of file

docker/README.md

+4 −4
Original line number Diff line number Diff line 


# Build snapshot image

# Build all images



```shell

make snapshot

make build

```



# Run oap by docker-compose

# Run skywalking by docker-compose



```shell

docker-compose -f stack.yml up

docker-compose up

```
 
 No newline at end of file

docker/config/application.yml

0 → 100644
+82 −0
Original line number Diff line number Diff line 
# 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.



cluster:

  standalone:

#  zookeeper:

#    hostPort: localhost:2181

#    # Retry Policy

#    baseSleepTimeMs: 1000 # initial amount of time to wait between retries

#    maxRetries: 3 # max number of times to retry

#  kubernetes:

#    watchTimeoutSeconds: 60

#    namespace: default

#    labelSelector: app=collector,release=skywalking

#    uidEnvName: SKYWALKING_COLLECTOR_UID

core:

  default:

    restHost: 0.0.0.0

    restPort: 12800

    restContextPath: /

    gRPCHost: 0.0.0.0

    gRPCPort: 11800

    downsampling:

    - Hour

    - Day

    - Month

    # Set a timeout on metric data. After the timeout has expired, the metric data will automatically be deleted.

    recordDataTTL: 90 # Unit is minute

    minuteMetricsDataTTL: 90 # Unit is minute

    hourMetricsDataTTL: 36 # Unit is hour

    dayMetricsDataTTL: 45 # Unit is day

    monthMetricsDataTTL: 18 # Unit is month

storage:

  elasticsearch:

    clusterNodes: elasticsearch:9200

    indexShardsNumber: 2

    indexReplicasNumber: 0

    # Batch process setting, refer to https://www.elastic.co/guide/en/elasticsearch/client/java-api/5.5/java-docs-bulk-processor.html

    bulkActions: 2000 # Execute the bulk every 2000 requests

    bulkSize: 20 # flush the bulk every 20mb

    flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests

    concurrentRequests: 2 # the number of concurrent requests

#  h2:

#    driver: org.h2.jdbcx.JdbcDataSource

#    url: jdbc:h2:mem:skywalking-oap-db

#    user: sa

receiver-register:

  default:

receiver-trace:

  default:

    bufferPath: ../trace-buffer/  # Path to trace buffer files, suggest to use absolute path

    bufferOffsetMaxFileSize: 100 # Unit is MB

    bufferDataMaxFileSize: 500 # Unit is MB

    bufferFileCleanWhenRestart: false

receiver-jvm:

  default:

service-mesh:

  default:

    bufferPath: ../mesh-buffer/  # Path to trace buffer files, suggest to use absolute path

    bufferOffsetMaxFileSize: 100 # Unit is MB

    bufferDataMaxFileSize: 500 # Unit is MB

    bufferFileCleanWhenRestart: false

istio-telemetry:

  default:

query:

  graphql:

    path: /graphql

alarm:

  default:

docker/snapshot/log4j2.xml→docker/config/log4j2.xml

+0 −0

File moved.

View file

docker/stack.yml→docker/docker-compose.yml

+15 −1
Original line number Diff line number Diff line
@@ -36,3 +36,17 @@ services: 
    ports:

      - 11800:11800

      - 12800:12800

    volumes:

      - ./config:/apache-skywalking-apm-incubating/config:ro

  ui:

    image: skywalking/ui

    container_name: ui

    depends_on:

      - oap

    links:

      - oap

    restart: always

    ports:

      - 8080:8080

    environment:

      collector.ribbon.listOfServers: oap:12800
 
 No newline at end of file