From 179e72cda041e41fa05a598fd39e00abb1f70e8d Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 29 Apr 2017 07:52:34 -0500
Subject: [PATCH] [cass] discontinue cassandra image

---
 README.md                 | 10 +++++++---
 cassandra/Dockerfile      | 26 --------------------------
 cassandra/README.md       |  9 ---------
 cassandra/cassandra.in.sh | 24 ------------------------
 4 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100755 cassandra/Dockerfile
 delete mode 100644 cassandra/README.md
 delete mode 100755 cassandra/cassandra.in.sh

diff --git a/README.md b/README.md
index 6c17639d..a43ed74e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
-dockerfiles
-===========
 
-Contains the various Dockerfile definitions I'm maintaining.
+This repository contains the various Dockerfile definitions I'm maintaining.
 
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/itzg/dockerfiles?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+### Discontinued
+
+##### Cassandra
+
+I have found the [official image](https://hub.docker.com/_/cassandra/) to be quite sufficient
diff --git a/cassandra/Dockerfile b/cassandra/Dockerfile
deleted file mode 100755
index ac73073b..00000000
--- a/cassandra/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM java:openjdk-8u72-jdk
-
-MAINTAINER itzg
-
-ENV CASSANDRA_VERSION 2.2.8
-
-ADD http://apache.mirrors.pair.com/cassandra/$CASSANDRA_VERSION/apache-cassandra-$CASSANDRA_VERSION-bin.tar.gz /tmp/apache-cassandra.tgz
-RUN tar -C /opt -zxf /tmp/apache-cassandra.tgz && \
-  rm /tmp/apache-cassandra.tgz
-
-
-RUN mv /opt/apache-cassandra-$CASSANDRA_VERSION /opt/cassandra
-ENV CASSANDRA_HOME /opt/cassandra
-ENV CASSANDRA_CONF /conf
-ENV CASSANDRA_DATA /data
-WORKDIR $CASSANDRA_HOME
-
-RUN ln -s $CASSANDRA_HOME/bin/* /usr/local/bin
-VOLUME ["/data","/conf"]
-
-EXPOSE 9042 9160 7000 7001
-
-ADD cassandra.in.sh $CASSANDRA_HOME/cassandra.in.sh
-RUN mv $CASSANDRA_HOME/bin/cassandra.in.sh $CASSANDRA_HOME/bin/orig.cassandra.in.sh
-
-CMD ["/opt/cassandra/bin/cassandra", "-f"]
diff --git a/cassandra/README.md b/cassandra/README.md
deleted file mode 100644
index 0b526f56..00000000
--- a/cassandra/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Yet another Cassandra image, but this one got container and non-container access right.
-
-# Basic Usage
-
-To support access from both Docker containers and external, non-Docker clients:
-
-    docker run -d --name cassandra -e PUBLISH_AS=192.168.59.103 -p 9160:9160 itzg/cassandra
-
-replacing `192.168.59.103` with your Docker host's LAN IP address.
diff --git a/cassandra/cassandra.in.sh b/cassandra/cassandra.in.sh
deleted file mode 100755
index a04c7690..00000000
--- a/cassandra/cassandra.in.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-cassYml=$CASSANDRA_HOME/conf/cassandra.yaml
-
-privateAddr=$(hostname -i)
-
-seeds=${SEEDS:-${PUBLISH_AS:-$privateAddr}}
-
-sed -i -e "s/- seeds:.*/- seeds: \"$seeds\"/" \
-  -e "s/listen_address:.*/listen_address: $privateAddr/" \
-  -e "s/rpc_address:.*/rpc_address: $privateAddr/" \
-  -e "s/start_rpc:.*/start_rpc: true/" \
-  -e "s#- /var/lib/cassandra/data#- $CASSANDRA_DATA#" \
-  $cassYml
-
-if [ -n "$PUBLISH_AS" ]; then
-  sed -i -e "s/\(\s*#\)\?\s*broadcast_address:.*/broadcast_address: $PUBLISH_AS/" $cassYml
-fi
-
-# Copy over our tweaked files, but non-clobbering to let user have ultimate control
-cp -rn $CASSANDRA_HOME/conf/* $CASSANDRA_CONF
-
-# source the original
-. $CASSANDRA_HOME/bin/orig.cassandra.in.sh