From 9e9e948d88a5f163a117fe8828078271558cd9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= <juraci@kroehling.de>
Date: Wed, 19 Jul 2017 23:20:22 +0200
Subject: [PATCH] Switched the Cassandra Schema image to use the official image
 as base image (#278)

---
 plugin/storage/cassandra/Dockerfile       | 3 +--
 plugin/storage/cassandra/schema/docker.sh | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugin/storage/cassandra/Dockerfile b/plugin/storage/cassandra/Dockerfile
index 9a16cc380ce..f4c11cf58b9 100644
--- a/plugin/storage/cassandra/Dockerfile
+++ b/plugin/storage/cassandra/Dockerfile
@@ -1,5 +1,4 @@
-# TODO: replace this by the final Cassandra image
-FROM jpkroehling/cassandra
+FROM cassandra:3.11
 
 COPY schema/* /cassandra-schema/
 
diff --git a/plugin/storage/cassandra/schema/docker.sh b/plugin/storage/cassandra/schema/docker.sh
index 5556f99a0ff..83035420552 100755
--- a/plugin/storage/cassandra/schema/docker.sh
+++ b/plugin/storage/cassandra/schema/docker.sh
@@ -3,7 +3,7 @@
 # This script is used in the Docker image jaegertracing/jaeger-cassandra-schema
 # that allows installing Jaeger keyspace and schema without installing cqlsh.
 
-CQLSH=/opt/apache-cassandra-3.0.12/bin/cqlsh
+CQLSH=${CQLSH:-"/usr/bin/cqlsh"}
 CQLSH_HOST=${CQLSH_HOST:-"cassandra"}
 CASSANDRA_WAIT_TIMEOUT=${CASSANDRA_WAIT_TIMEOUT:-"60"}
 DATACENTER=${DATACENTER:-"dc1"}