From b6e9a8bcac3ffad2c67ef84a235222176e0999d7 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Tue, 22 Dec 2015 14:25:05 +0800
Subject: [PATCH] Bumps to latest zipkin and hints about JAVA_OPTS in docker

---
 pom.xml                                                   | 2 +-
 .../docker-compose.yml                                    | 3 ++-
 .../spring-cloud-sleuth-sample-zipkin/docker-compose.yml  | 8 ++++----
 spring-cloud-sleuth-zipkin/docker-compose.yml             | 8 ++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8a1443acb..738dd4c86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,7 +203,7 @@
 		<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<aspectj.version>1.8.4</aspectj.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
-		<zipkin-java.version>0.1.1</zipkin-java.version>
+		<zipkin-java.version>0.1.2</zipkin-java.version>
 	</properties>
 
 	<profiles>
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
index 96299f6cd..608092e32 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
@@ -20,6 +20,7 @@ zipkin:
   environment:
     - MYSQL_HOST=mysql
     - RABBIT_HOST=rabbitmq
+    # - JAVA_OPTS=your jvm params here
   expose:
     - 9411
   ports:
@@ -28,7 +29,7 @@ zipkin:
     - mysql
     - rabbitmq
 web:
-  image: openzipkin/zipkin-web:1.26.0
+  image: openzipkin/zipkin-web:1.28.0
   ports:
     - 8080:8080
   environment:
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml
index 96412aba0..278e87ce8 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml
@@ -1,9 +1,9 @@
 mysql:
-  image: openzipkin/zipkin-mysql:1.26.0
+  image: openzipkin/zipkin-mysql:1.28.0
   ports:
     - 3306:3306
 collector:
-  image: openzipkin/zipkin-collector:1.26.0
+  image: openzipkin/zipkin-collector:1.28.0
   environment:
     - TRANSPORT_TYPE=scribe
     - STORAGE_TYPE=mysql
@@ -15,7 +15,7 @@ collector:
   links:
     - mysql:storage
 query:
-  image: openzipkin/zipkin-query:1.26.0
+  image: openzipkin/zipkin-query:1.28.0
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -28,7 +28,7 @@ query:
   links:
     - mysql:storage
 web:
-  image: openzipkin/zipkin-web:1.26.0
+  image: openzipkin/zipkin-web:1.28.0
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
diff --git a/spring-cloud-sleuth-zipkin/docker-compose.yml b/spring-cloud-sleuth-zipkin/docker-compose.yml
index 96412aba0..278e87ce8 100644
--- a/spring-cloud-sleuth-zipkin/docker-compose.yml
+++ b/spring-cloud-sleuth-zipkin/docker-compose.yml
@@ -1,9 +1,9 @@
 mysql:
-  image: openzipkin/zipkin-mysql:1.26.0
+  image: openzipkin/zipkin-mysql:1.28.0
   ports:
     - 3306:3306
 collector:
-  image: openzipkin/zipkin-collector:1.26.0
+  image: openzipkin/zipkin-collector:1.28.0
   environment:
     - TRANSPORT_TYPE=scribe
     - STORAGE_TYPE=mysql
@@ -15,7 +15,7 @@ collector:
   links:
     - mysql:storage
 query:
-  image: openzipkin/zipkin-query:1.26.0
+  image: openzipkin/zipkin-query:1.28.0
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -28,7 +28,7 @@ query:
   links:
     - mysql:storage
 web:
-  image: openzipkin/zipkin-web:1.26.0
+  image: openzipkin/zipkin-web:1.28.0
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http