removed datastax agent software after moving to straight apache cassandra

Author: dcovello

cassandra/Dockerfile

@@ -20,28 +20,42 @@ RUN echo "oracle-java8-installer	shared/accepted-oracle-license-v1-1	boolean	tru
 RUN /usr/bin/debconf-set-selections /tmp/oracle-license-debconf
 RUN rm /tmp/oracle-license-debconf
 
+# Add cassandre repo
+RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 514A2AD631A57A16DD0047EC749D6EEC0353B12C && \
+    echo 'deb http://www.apache.org/dist/cassandra/debian 35x main' >> /etc/apt/sources.list.d/cassandra.list
+
+
 # Install the JDK
 RUN apt-get install -y oracle-java8-installer oracle-java8-set-default
-RUN apt-get update
 
-#Instal missing python-support
-RUN wget http://launchpadlibrarian.net/109052632/python-support_1.0.15_all.deb \
+# Install cassandra + dependencies
+RUN apt-get update -y && apt-get install -y software-properties-common \
+    && apt-get install wget \
+    && apt-get install -yq --force-yes --no-install-recommends \
+                python-dev python-pip python-setuptools \ 
+                libffi-dev libssh2-1-dev zlib1g-dev libssl-dev \
+                pkg-config libhttp-parser-dev virt-what python-m2crypto \
+                gcc \
+    && wget http://launchpadlibrarian.net/109052632/python-support_1.0.15_all.deb \
     && dpkg -i python-support_1.0.15_all.deb \
+    && apt-get install -y cassandra="$CASSANDRA_VERSION" \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN echo "deb http://debian.datastax.com/datastax-ddc $CASSANDRA_VERSION main" | tee -a /etc/apt/sources.list.d/cassandra.sources.list
-RUN curl -L https://debian.datastax.com/debian/repo_key | apt-key add -
-RUN apt-get update && apt-get -y install datastax-ddc
+##Instal missing python-support
+#RUN apt-get update && apt-get install ajenti \
+#    && wget http://launchpadlibrarian.net/109052632/python-support_1.0.15_all.deb \
+#    && dpkg -i python-support_1.0.15_all.deb
+
+#RUN echo "deb http://debian.datastax.com/datastax-ddc $CASSANDRA_VERSION main" | tee -a /etc/apt/sources.list.d/cassandra.sources.list
+#RUN cat /etc/apt/sources.list.d/cassandra.sources.list
+#RUN curl -L https://debian.datastax.com/debian/repo_key | apt-key add -
+#RUN apt-get update && apt-get -y install ajenti datastax-ddc
 
 # Copy Cassandra Startup Scripts
 RUN mkdir /etc/service/cassandra
 ADD src/start-cass.sh /etc/service/cassandra/run
 RUN chmod +x /etc/service/cassandra/run
 
-# Copy Cassandra Startup Scripts
-RUN mkdir /etc/service/datastax_agent
-ADD src/start-agent.sh /etc/service/datastax_agent/run
-RUN chmod +x /etc/service/datastax_agent/run
-
 # Expose Ports
 EXPOSE 7199 7000 7001 9160 9042