Remove unnecessary links to xdock test_driver (#507)

jaegertracing · Nov 2, 2017 · 4c80d57 · 4c80d57
1 parent d3df7c8
commit 4c80d57
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/crossdock/docker-compose.yml b/crossdock/docker-compose.yml
@@ -27,58 +27,45 @@ services:
         image: jaegertracing/xdock-go
         ports:
             - "8080-8082"
-        links:
-          - "jaeger-agent:test_driver"
 
     node:
         image: jaegertracing/xdock-node
         ports:
             - "8080-8082"
-        links:
-          - "jaeger-agent:test_driver"
 
     java:
         image: jaegertracing/xdock-java
         ports:
             - "8080-8082"
-        links:
-          - "jaeger-agent:test_driver"
 
     python:
         image: jaegertracing/xdock-py
         ports:
             - "8080-8082"
-        links:
-          - "jaeger-agent:test_driver"
 
     zipkin-brave-json:
         image: jaegertracing/xdock-zipkin-brave
         ports:
             - "8080-8081"
         environment:
             - ENCODING=JSON
-        links:
-          - "jaeger-collector:test_driver"
 
     zipkin-brave-thrift:
         image: jaegertracing/xdock-zipkin-brave
         ports:
             - "8080-8081"
         environment:
             - ENCODING=THRIFT
-        links:
-          - "jaeger-collector:test_driver"
 
     test_driver:
         image: jaegertracing/test-driver
         ports:
             - "8080"
-        links:
-          - jaeger-query
-          - jaeger-collector
-          - jaeger-agent
+        depends_on:
+            - jaeger-query
+            - jaeger-collector
+            - jaeger-agent
 
     jaeger-query:
 #    override to disable static files
-      command: ["/go/bin/query-linux", "--query.static-files=", "--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra"]
-
+        command: ["/go/bin/query-linux", "--query.static-files=", "--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra"]
diff --git a/docker-compose/jaeger-docker-compose.yml b/docker-compose/jaeger-docker-compose.yml
@@ -11,7 +11,7 @@ services:
         - "9411:9411"
       restart: on-failure
       depends_on:
-          - cassandra-schema
+        - cassandra-schema
 
     jaeger-query:
       image: jaegertracing/jaeger-query
@@ -20,6 +20,8 @@ services:
         - "16686:16686"
         - "16687"
       restart: on-failure
+      depends_on:
+        - cassandra-schema
 
     jaeger-agent:
       image: jaegertracing/jaeger-agent
@@ -31,13 +33,13 @@ services:
         - "5778:5778"
       restart: on-failure
       depends_on:
-          - jaeger-collector
+        - jaeger-collector
 
     cassandra:
       image: cassandra:3.9
 
     cassandra-schema:
       image: jaegertracing/jaeger-cassandra-schema
       depends_on:
-          - cassandra
+        - cassandra