Merge pull request #133 from ascrutae/zhangxin/support-docker-image

update docker image
2017-04-12 09:15:14 +08:00 · 2017-04-12 09:15:14 +08:00 · be35f18839
parent 50daaf64a0 6a7ff33a16
commit be35f18839
5 changed files with 146 additions and 76 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,87 +1,40 @@
-version: '2'
+version: '2.1'
 services:
-
-  skywalking-storage:
-    image: skywalking/skywalking-storage:2.1-2017
-    expose:
-      - "34000"
-    depends_on:
-      - registry-center-server
-    links:
-      - registry-center-server
-    environment:
-      - REGISTRY_CENTER_URL=registry-center-server:2181
-
-  skywalking-alarm:
-    image: skywalking/skywalking-alarm:2.1-2017
-    depends_on:
-      - alarm-coordinate-zk
-      - mysql-server
-      - redis-server
-    links:
-      - alarm-coordinate-zk
-      - mysql-server
-      - redis-server
-    environment:
-      - ALARM_COORDINATE_ZK_ADDRESS=alarm-coordinate-zk:2181
-      - MYSQL_SERVER=mysql-server:3306
-      - REDIS_SERVER=redis-server:6379
-      - WEBUI_DEPLOY_ADDRESS=192.168.1.104:8080
-      - WEBUI_APPLICATION_CONTEXT=skywalking
-      - ALARM_MAIL_HOST=smtp.mail.com
-      - MAIL_USER_NAME=skywalking
-      - MAIL_PASSWORD=skywalking
-      - MAIL_SENDER_MAIL=skywalking@mail.com
-
-  skywalking-routing:
-    image: skywalking/skywalking-routing:2.1-2017
-    expose:
-      - "23000"
-    ports:
-      - "23000:23000"
-    depends_on:
-      - registry-center-server
-    links:
-      - registry-center-server
-    environment:
-      - REGISTRY_CENTER_URL=registry-center-server:2181
-      - ALARM_REDIS_SERVER=redis-server:6379
-
  skywalking-webui:
-    image: skywalking/skywalking-webui:2.1-2017
+    image: sky-walking-ui:1.0
    expose:
      - "8080"
    ports:
      - "8080:8080"
-    depends_on:
-      - mysql-server
-      - registry-center-server
    links:
-      - mysql-server
-      - registry-center-server
+      - skywalking-collector
    environment:
-      - MYSQL_URL=mysql-server:3306
-      - REGISTRY_CENTER_URL=registry-center-server:2181
+      - COLLECTOR_SERVERS=skywalking-collector:7001

-  mysql-server:
-    image: mysql:5.6
+  skywalking-collector:
+    image: skywalking-collector:3.0-2017
    expose:
-      - "3306"
+      - "7001"
+      - "1000"
+    ports:
+      - "7001:7001"
+    depends_on:
+      es-server:
+        condition: service_healthy
+    links:
+      - es-server
    environment:
-      MYSQL_DATABASE: test
-      MYSQL_ROOT_PASSWORD: root
+      - ES_CLUSTER_NODES=es-server:9300
+      - HTTP_HOST_NAME=0.0.0.0

-  registry-center-server:
-    image: zookeeper:3.4.9
+  es-server:
+    image: elasticsearch:5.3
+    command: "-Enode.name=TestNode -Enetwork.host=0.0.0.0 -Ehttp.cors.enabled=true -Ehttp.cors.allow-origin=* -Ethread_pool.bulk.queue_size=1000 -Ecluster.name=CollectorDBCluster"
    expose:
-      - "2181"
-
-  redis-server:
-    image: redis:3.2.6
-    expose:
-      - "6379"
-
-  alarm-coordinate-zk:
-    image: zookeeper:3.4.9
-    expose:
-      - "2181"
+      - "9200"
+      - "9300"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9200"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
--- a/skywalking-collector/skywalking-collector-worker/docker/Dockerfile
+++ b/skywalking-collector/skywalking-collector-worker/docker/Dockerfile
@ -1,5 +1,22 @@
 FROM openjdk:8-jdk

+ENV CLUSTER_CURRENT_HOST_NAME=127.0.0.1 \
+    CLUSTER_CURRENT_PORT=1000 \
+    CLUSTER_CURRENT_ROLES=WorkersListener \
+    CLUSTER_SEED_NODES=127.0.0.1:1000,127.0.0.1:1001 \
+    ES_CLUSTER_NAME=CollectorDBCluster \
+    ES_CLUSTER_NODES=127.0.0.1:9300 \
+    ES_INDEX_SHARDS_NUMBER=2 \
+    ES_INDEX_REPLICAS_NUMBER=0 \
+    HTTP_HOST_NAME=127.0.0.1 \
+    HTTP_PORT=7001 \
+    HTTP_CONTEXT_PATH=/
+
 ADD skywalking-collector.tar.gz /usr/local
 COPY startup.sh /usr/local/skywalking-collector/bin
-CMD ["/bin/bash","/usr/local/skywalking-collector/bin/startup.sh"]
+COPY collector.config /usr/local/skywalking-collector/config
+ADD docker-entrypoint.sh /
+RUN chmod +x /docker-entrypoint.sh && chmod +x /usr/local/skywalking-collector/bin/startup.sh
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["/usr/local/skywalking-collector/bin/startup.sh"]
--- a/skywalking-collector/skywalking-collector-worker/docker/collector.config
+++ b/skywalking-collector/skywalking-collector-worker/docker/collector.config
@ -0,0 +1,63 @@
+cluster.current.hostname={CLUSTER_CURRENT_HOST_NAME}
+cluster.current.port={CLUSTER_CURRENT_PORT}
+cluster.current.roles={CLUSTER_CURRENT_ROLES}
+cluster.seed_nodes={CLUSTER_SEED_NODES}
+
+es.cluster.name={ES_CLUSTER_NAME}
+es.cluster.nodes={ES_CLUSTER_NODES}
+es.cluster.transport.sniffer=true
+
+es.index.shards.number={ES_INDEX_SHARDS_NUMBER}
+es.index.replicas.number={ES_INDEX_REPLICAS_NUMBER}
+
+http.hostname={HTTP_HOST_NAME}
+http.port={HTTP_PORT}
+http.contextPath={HTTP_CONTEXT_PATH}
+
+cache.analysis.size=1024
+cache.persistence.size=1024
+
+WorkerNum.Node.NodeCompAgg.Value=10
+WorkerNum.Node.NodeMappingDayAgg.Value=10
+WorkerNum.Node.NodeMappingHourAgg.Value=10
+WorkerNum.Node.NodeMappingMinuteAgg.Value=10
+
+WorkerNum.NodeRef.NodeRefDayAgg.Value=10
+WorkerNum.NodeRef.NodeRefHourAgg.Value=10
+WorkerNum.NodeRef.NodeRefMinuteAgg.Value=10
+WorkerNum.NodeRef.NodeRefResSumDayAgg.Value=10
+WorkerNum.NodeRef.NodeRefResSumHourAgg.Value=10
+WorkerNum.NodeRef.NodeRefResSumMinuteAgg.Value=10
+
+WorkerNum.GlobalTrace.GlobalTraceAgg.Value=10
+
+Queue.GlobalTrace.GlobalTraceSave.Size=1024
+Queue.GlobalTrace.GlobalTraceAnalysis.Size=1024
+
+Queue.Segment.SegmentPost.Size=1024
+Queue.Segment.SegmentCostSave.Size=1024
+Queue.Segment.SegmentSave.Size=1024
+Queue.Segment.SegmentExceptionSave.Size=1024
+
+Queue.Node.NodeCompAnalysis.Size=1024
+Queue.Node.NodeMappingDayAnalysis.Size=1024
+Queue.Node.NodeMappingHourAnalysis.Size=1024
+Queue.Node.NodeMappingMinuteAnalysis.Size=1024
+Queue.Node.NodeCompSave.Size=1024
+Queue.Node.NodeMappingDaySave.Size=1024
+Queue.Node.NodeMappingHourSave.Size=1024
+Queue.Node.NodeMappingMinuteSave.Size=1024
+
+Queue.NodeRef.NodeRefDayAnalysis.Size=1024
+Queue.NodeRef.NodeRefHourAnalysis.Size=1024
+Queue.NodeRef.NodeRefMinuteAnalysis.Size=1024
+Queue.NodeRef.NodeRefDaySave.Size=1024
+Queue.NodeRef.NodeRefHourSave.Size=1024
+Queue.NodeRef.NodeRefMinuteSave.Size=1024
+Queue.NodeRef.NodeRefResSumDaySave.Size=1024
+Queue.NodeRef.NodeRefResSumHourSave.Size=1024
+Queue.NodeRef.NodeRefResSumMinuteSave.Size=1024
+Queue.NodeRef.NodeRefResSumDayAnalysis.Size=1024
+Queue.NodeRef.NodeRefResSumHourAnalysis.Size=1024
+Queue.NodeRef.NodeRefResSumMinuteAnalysis.Size=1024
+
--- a/skywalking-collector/skywalking-collector-worker/docker/docker-entrypoint.sh
+++ b/skywalking-collector/skywalking-collector-worker/docker/docker-entrypoint.sh
@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+echo "replace CLUSTER_CURRENT_HOST_NAME with $CLUSTER_CURRENT_HOST_NAME"
+eval sed -i -e 's/\{CLUSTER_CURRENT_HOST_NAME\}/$CLUSTER_CURRENT_HOST_NAME/' /usr/local/skywalking-collector/config/collector.config
+
+echo "replace CLUSTER_CURRENT_PORT with $CLUSTER_CURRENT_PORT"
+eval sed -i -e 's/\{CLUSTER_CURRENT_PORT\}/$CLUSTER_CURRENT_PORT/' /usr/local/skywalking-collector/config/collector.config
+
+echo "replace CLUSTER_CURRENT_ROLES with $CLUSTER_CURRENT_ROLES"
+eval sed -i -e 's/\{CLUSTER_CURRENT_ROLES\}/$CLUSTER_CURRENT_ROLES/' /usr/local/skywalking-collector/config/collector.config
+
+echo "replace CLUSTER_SEED_NODES with $CLUSTER_SEED_NODES"
+eval sed -i -e 's/\{CLUSTER_SEED_NODES\}/$CLUSTER_SEED_NODES/' /usr/local/skywalking-collector/config/collector.config
+
+echo "replace ES_CLUSTER_NAME with $ES_CLUSTER_NAME"
+eval sed -i -e 's/\{ES_CLUSTER_NAME\}/$ES_CLUSTER_NAME/' /usr/local/skywalking-collector/config/collector.config
+
+
+echo "replcae ES_CLUSTER_NODES with $ES_CLUSTER_NODES"
+eval sed -i -e 's/\{ES_CLUSTER_NODES\}/$ES_CLUSTER_NODES/'  /usr/local/skywalking-collector/config/collector.config
+
+echo "replace ES_INDEX_SHARDS_NUMBER with $ES_INDEX_SHARDS_NUMBER"
+eval sed -i -e 's/\{ES_INDEX_SHARDS_NUMBER\}/$ES_INDEX_SHARDS_NUMBER/'   /usr/local/skywalking-collector/config/collector.config
+
+echo "replace ES_INDEX_REPLICAS_NUMBER with $ES_INDEX_REPLICAS_NUMBER"
+eval sed -i -e 's/\{ES_INDEX_REPLICAS_NUMBER\}/$ES_INDEX_REPLICAS_NUMBER/'    /usr/local/skywalking-collector/config/collector.config
+
+echo "replace HTTP_HOST_NAME with $HTTP_HOST_NAME"
+eval sed -i -e 's/\{HTTP_HOST_NAME\}/$HTTP_HOST_NAME/'  /usr/local/skywalking-collector/config/collector.config
+
+echo "replace HTTP_PORT with $HTTP_PORT"
+eval sed -i -e 's/\{HTTP_PORT\}/$HTTP_PORT/' /usr/local/skywalking-collector/config/collector.config
+
+echo "replace HTTP_CONTEXT_PATH with $HTTP_CONTEXT_PATH"
+eval sed -i -e 's/\{HTTP_CONTEXT_PATH\}/$HTTP_CONTEXT_PATH/' /usr/local/skywalking-collector/config/collector.config
+
+exec "$@"
--- a/skywalking-collector/skywalking-collector-worker/pom.xml
+++ b/skywalking-collector/skywalking-collector-worker/pom.xml
@ -15,7 +15,7 @@
    <properties>
        <jetty.version>9.4.2.v20170220</jetty.version>
        <main.class>com.a.eye.skywalking.collector.worker.CollectorBootStartUp</main.class>
-        <docker.cache.imageName>${artifactId}</docker.cache.imageName>
+        <docker.cache.imageName>skywalking-collector</docker.cache.imageName>
        <docker.imageTag.version>${version}</docker.imageTag.version>
    </properties>