Add Cassandra 3.0 and a new "cassandra-basics" test

library/cassandra

@@ -1,12 +1,13 @@
 # maintainer: InfoSiftr <[email protected]> (@infosiftr)
 
-2.0.17: git://github.com/docker-library/cassandra@5d31a1e20371873affd9ce8ea630aedb94618471 2.0
-2.0: git://github.com/docker-library/cassandra@5d31a1e20371873affd9ce8ea630aedb94618471 2.0
+2.1.11: git://github.com/docker-library/cassandra@b72500bc9b75278301abcc14f86fe52a48e0ce5f 2.1
+2.1: git://github.com/docker-library/cassandra@b72500bc9b75278301abcc14f86fe52a48e0ce5f 2.1
 
-2.1.11: git://github.com/docker-library/cassandra@92e84142e864c087420196904ed01de624a3b633 2.1
-2.1: git://github.com/docker-library/cassandra@92e84142e864c087420196904ed01de624a3b633 2.1
+2.2.3: git://github.com/docker-library/cassandra@b72500bc9b75278301abcc14f86fe52a48e0ce5f 2.2
+2.2: git://github.com/docker-library/cassandra@b72500bc9b75278301abcc14f86fe52a48e0ce5f 2.2
+2: git://github.com/docker-library/cassandra@b72500bc9b75278301abcc14f86fe52a48e0ce5f 2.2
 
-2.2.3: git://github.com/docker-library/cassandra@92e84142e864c087420196904ed01de624a3b633 2.2
-2.2: git://github.com/docker-library/cassandra@92e84142e864c087420196904ed01de624a3b633 2.2
-2: git://github.com/docker-library/cassandra@92e84142e864c087420196904ed01de624a3b633 2.2
-latest: git://github.com/docker-library/cassandra@92e84142e864c087420196904ed01de624a3b633 2.2
+3.0.0: git://github.com/docker-library/cassandra@b72500bc9b75278301abcc14f86fe52a48e0ce5f 3.0
+3.0: git://github.com/docker-library/cassandra@b72500bc9b75278301abcc14f86fe52a48e0ce5f 3.0
+3: git://github.com/docker-library/cassandra@b72500bc9b75278301abcc14f86fe52a48e0ce5f 3.0
+latest: git://github.com/docker-library/cassandra@b72500bc9b75278301abcc14f86fe52a48e0ce5f 3.0

test/config.sh

@@ -25,6 +25,9 @@ imageTests+=(
 	'
 	[busybox]='
 	'
+	[cassandra]='
+		cassandra-basics
+	'
 	[celery]='
 	'
 	[clojure]='

test/tests/cassandra-basics/run.sh

@@ -0,0 +1,85 @@
+#!/bin/bash
+
+[ "$DEBUG" ] && set -x
+
+set -eo pipefail -o errtrace
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+image="$1"
+
+# Use the image being tested as our client image since it should already have curl
+clientImage="$image"
+
+# Create an instance of the container-under-test
+cid="$(
+	docker run -d \
+		-e JVM_OPTS='
+			-Dcom.sun.management.jmxremote.port=7199
+			-Dcom.sun.management.jmxremote.ssl=false
+			-Dcom.sun.management.jmxremote.authenticate=false
+		' \
+		"$image"
+)"
+trap "docker rm -vf $cid > /dev/null" EXIT
+trap "( set -x; docker logs --tail=20 $cid )" ERR
+
+_status() {
+	docker run --rm --link "$cid":cassandra "$clientImage" nodetool -h cassandra status
+}
+
+# Make sure our container is up
+. "$dir/../../retry.sh" '_status'
+
+cqlsh() {
+	docker run -i --rm \
+		--link "$cid":cassandra \
+		"$clientImage" \
+		cqlsh -u cassandra -p cassandra "$@" cassandra
+}
+
+# Make sure our container is listening
+. "$dir/../../retry.sh" 'cqlsh < /dev/null'
+
+# https://wiki.apache.org/cassandra/GettingStarted#Step_4:_Using_cqlsh
+
+cqlsh -e "
+CREATE KEYSPACE mykeyspace
+	WITH REPLICATION = {
+		'class': 'SimpleStrategy',
+		'replication_factor': 1
+	}
+"
+
+cqlsh -k mykeyspace -e "
+CREATE TABLE users (
+	user_id int PRIMARY KEY,
+	fname text,
+	lname text
+)
+"
+
+cqlsh -k mykeyspace -e "
+INSERT INTO users (user_id,  fname, lname)
+	VALUES (1745, 'john', 'smith')
+"
+cqlsh -k mykeyspace -e "
+INSERT INTO users (user_id,  fname, lname)
+	VALUES (1744, 'john', 'doe')
+"
+cqlsh -k mykeyspace -e "
+INSERT INTO users (user_id,  fname, lname)
+	VALUES (1746, 'john', 'smith')
+"
+
+# TODO find some way to get cqlsh to provide machine-readable output D:
+[[ "$(cqlsh -k mykeyspace -e "
+SELECT * FROM users
+")" == *'3 rows'* ]]
+
+cqlsh -k mykeyspace -e "
+CREATE INDEX ON users (lname)
+"
+[[ "$(cqlsh -k mykeyspace -e "
+SELECT * FROM users WHERE lname = 'smith'
+")" == *'2 rows'* ]]