Skip to content
This repository has been archived by the owner on Oct 23, 2019. It is now read-only.

Commit

Permalink
updates to latest zipkin 1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Cole committed Dec 20, 2016
1 parent a6869a3 commit b8633dd
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions docker-compose-cassandra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ version: '2'
services:
# Run Cassandra instead of MySQL
storage:
image: openzipkin/zipkin-cassandra:1.17.0
image: openzipkin/zipkin-cassandra:1.18.0
container_name: cassandra
ports:
- 9042:9042

# Switch storage type to Cassandra
zipkin:
image: openzipkin/zipkin:1.17.0
image: openzipkin/zipkin:1.18.0
environment:
- STORAGE_TYPE=cassandra
# When overriding this value, note the minimum supported version is 2.2
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ version: '2'
services:
# Run Elasticsearch instead of MySQL
storage:
image: openzipkin/zipkin-elasticsearch:1.17.0
image: openzipkin/zipkin-elasticsearch:1.18.0
container_name: elasticsearch
ports:
# http
- 9200:9200

# Switch storage type to Elasticsearch
zipkin:
image: openzipkin/zipkin:1.17.0
image: openzipkin/zipkin:1.18.0
environment:
- STORAGE_TYPE=elasticsearch
# Point the zipkin at the storage backend
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: '2'
services:
kafka-zookeeper:
build: kafka
image: openzipkin/zipkin-kafka:1.17.0
image: openzipkin/zipkin-kafka:1.18.0
container_name: kafka-zookeeper
environment:
# corresponds to your docker machine and your producer's broker list
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
# wire the containers together.

storage:
image: openzipkin/zipkin-cassandra:1.17.0
image: openzipkin/zipkin-cassandra:1.18.0
ports:
- 9042:9042

# The zipkin process services the UI, and also exposes a POST endpoint that
# instrumentation can send trace data to. Scribe is enabled by default.
# It can also poll kafka, when the KAFKA_ZOOKEEPER variable is set.
zipkin:
image: openzipkin/zipkin:1.17.0
image: openzipkin/zipkin:1.18.0
environment:
- STORAGE_TYPE=cassandra
# Uncomment to enable self-tracing
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version: '2'

services:
zipkin-ui:
image: openzipkin/zipkin-ui:1.17.0
image: openzipkin/zipkin-ui:1.18.0
container_name: zipkin-ui
ports:
- 80:80
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ version: '2'

services:
storage:
image: openzipkin/zipkin-mysql:1.17.0
image: openzipkin/zipkin-mysql:1.18.0
container_name: mysql
ports:
- 3306:3306

# The zipkin process services the UI, and also exposes a POST endpoint that
# instrumentation can send trace data to. Scribe is enabled by default.
zipkin:
image: openzipkin/zipkin:1.17.0
image: openzipkin/zipkin:1.18.0
container_name: zipkin
# Environment settings are defined here https://github.com/openzipkin/zipkin/tree/1.17.0/zipkin-server#environment-variables
# Environment settings are defined here https://github.com/openzipkin/zipkin/tree/1.18.0/zipkin-server#environment-variables
environment:
- STORAGE_TYPE=mysql
# Point the zipkin at the storage backend
Expand Down

0 comments on commit b8633dd

Please sign in to comment.