From 6a7ff33a16ba90983a17ef64fd2ad4d73fdbcbe5 Mon Sep 17 00:00:00 2001
From: zhangxin <zhangxin@oneapm.com>
Date: Tue, 11 Apr 2017 23:28:44 +0800
Subject: [PATCH] update docker compose

---
 docker-compose.yml                            | 33 +++++++++++++++----
 .../skywalking-collector-worker/pom.xml       |  2 +-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 806da5e864..aae455935d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,40 @@
-version: '2'
+version: '2.1'
 services:
-  skywalking-collector-worker:
-    image: skywalking-collector-worker:3.0-2017
+  skywalking-webui:
+    image: sky-walking-ui:1.0
+    expose:
+      - "8080"
+    ports:
+      - "8080:8080"
+    links:
+      - skywalking-collector
+    environment:
+      - COLLECTOR_SERVERS=skywalking-collector:7001
+
+  skywalking-collector:
+    image: skywalking-collector:3.0-2017
     expose:
       - "7001"
       - "1000"
+    ports:
+      - "7001:7001"
     depends_on:
-      - es-server
+      es-server:
+        condition: service_healthy
     links:
       - es-server
+    environment:
+      - ES_CLUSTER_NODES=es-server:9300
+      - HTTP_HOST_NAME=0.0.0.0
 
   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:
       - "9200"
       - "9300"
-    entrypoint: elasticsearch
-    command: "-Des.node.name=CollectorDBCluster"
\ No newline at end of file
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9200"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
\ No newline at end of file
diff --git a/skywalking-collector/skywalking-collector-worker/pom.xml b/skywalking-collector/skywalking-collector-worker/pom.xml
index 895581bc46..fe61d9bdfc 100644
--- 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>
 
-- 
GitLab