Merge 6e99739 into e576ab5

.travis.yml

@@ -29,7 +29,7 @@ services:
 
 env:
   global:
-    - DOCKER_COMPOSE_VERSION=1.8.0
+    - DOCKER_COMPOSE_VERSION=1.13.0
     - COMMIT=${TRAVIS_COMMIT::8}
     # DOCKER_USER
     - secure: TNvbr5/d7raSovEtttxdrZl8tP7vCCzL56gKKhr2wF4ET5/iRbcfSP9zoFPEOlIdgmCHZhGTh+fED1Eqgyswv6HPOAfEuov5vtzNB9fkcI46/nRk7KbiDlcEuE2IFtwkijFDz6YdJlbPCozHa81/Ih6G20H61tgv6f0AsGGT9MR7DQ71cCu8xZykNDjEKTo7RF6GiqG2VYa+S1P3vCOKRv31ouo/a5SPP+1AIvAg8u++qWVC8WJixmkXnw2OplvCFgHS0dlT3FvUPjYtUtLens5gpBDo7kn7+Ba27m2D0IzkzDPW5sK0YMMZW61LLn8GLPiJtLqzUHovaJ2NcFfi07RQ4GSMnwnjP0nLQbgd0CzM2zJGJRcOTkYe7IEDrdcTBcljZdZAJdoJEzrGYYWRQcX0Kyjc83ghX3A5s+CQWlPElQrkBB7KhNZ+w2Cn4+Mr6zOiRnBYg1NIUV2eGHMNnC4HI9RqgvA1QqcT5YHWqpz20sddHx1kgzgh8vOW8csiFon/Wrvyb2TaemzsKxIlT/UZZfDuyWG/Lvm4oxmTp1GrgQsC2iJjox4z6VIxbhykZEqNU1dhY6KuvgjEGetxk2j/NVfI8Qb4tvWqKoXq5Buap/J0AWjxWjGbrIGZbz5FgzfEP33WR8X2Oh5Cy+TMl1v0+YBAB3OaMpe/Qe2rGlk=  # DOCKER_PASS

cmd/collector/main.go

@@ -131,6 +131,7 @@ func main() {
 			}()
 
 			hc.Ready()
+			logger.Info("Jaeger Collector is ready")
 			select {
 			case <-signalsChannel:
 				logger.Info("Jaeger Collector is finishing")

crossdock/docker-compose.yml

@@ -1,28 +1,29 @@
-version: '2'
+version: '3'
 
 services:
     crossdock:
         image: crossdock/crossdock
         links:
-            - test_driver
+            - test-driver
             - go
             - node
             - java
             - python
             - zipkin-brave-json
             - zipkin-brave-json-v2
             - zipkin-brave-thrift
-
         environment:
-            - WAIT_FOR=test_driver,go,node,java,python,zipkin-brave-thrift,zipkin-brave-json,zipkin-brave-json-v2
+            - WAIT_FOR=test-driver,go,node,java,python,zipkin-brave-thrift,zipkin-brave-json,zipkin-brave-json-v2
             - WAIT_FOR_TIMEOUT=60s
 
             - CALL_TIMEOUT=60s
 
-            - AXIS_CLIENT=test_driver
+            - AXIS_CLIENT=test-driver
             - AXIS_SERVICES=go,node,java,python,zipkin-brave-json,zipkin-brave-json-v2,zipkin-brave-thrift
 
             - BEHAVIOR_ENDTOEND=client,services
+        depends_on:
+            - test-driver
 
     go:
         image: jaegertracing/xdock-go
@@ -69,7 +70,7 @@ services:
         environment:
             - ENCODING=THRIFT
 
-    test_driver:
+    test-driver:
         image: jaegertracing/test-driver
         ports:
             - "8080"
@@ -79,5 +80,5 @@ services:
             - jaeger-agent
 
     jaeger-query:
-#    override to disable static files
+#   override to disable static files
         command: ["/go/bin/query-linux", "--query.static-files=", "--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra"]

crossdock/rules.mk

@@ -4,7 +4,7 @@ JAEGER_COMPOSE_YAML=docker-compose/jaeger-docker-compose.yml
 .PHONY: crossdock
 crossdock:
 	docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) kill
-	docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) rm -f test_driver
+	docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) rm -f test-driver
 	docker-compose -f $(JAEGER_COMPOSE_YAML) -f $(XDOCK_YAML) run crossdock 2>&1 | tee run-crossdock.log
 	grep 'Tests passed!' run-crossdock.log
 

docker-compose/jaeger-docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
     jaeger-collector:
@@ -42,4 +42,8 @@ services:
       image: jaegertracing/jaeger-cassandra-schema
       depends_on:
         - cassandra
-
+      healthcheck:
+        test: ["CMD-SHELL", "test -e /cassandra-schema/ready.txt || exit 1"]
+        interval: 5s
+        timeout: 5s
+        retries: 1

plugin/storage/cassandra/schema/docker.sh

@@ -29,4 +29,8 @@ done
 
 echo "Generating the schema for the keyspace ${KEYSPACE} and datacenter ${DATACENTER}"
 
+set -ex
+
 MODE="${MODE}" DATACENTER="${DATACENTER}" KEYSPACE="${KEYSPACE}" /cassandra-schema/create.sh | ${CQLSH}
+
+echo "Schema created" | tee /cassandra-schema/ready.txt