From 887a29c9baf210d5919bade61e97500e0c96ae93 Mon Sep 17 00:00:00 2001
From: chrislovecnm <clove@cnmconsulting.net>
Date: Sat, 21 May 2016 12:41:19 -0600
Subject: [PATCH] fixing docker file, and bumping cassandra version

---
 examples/cassandra/image/Dockerfile           |  34 ++++++++++++------
 examples/cassandra/image/cassandra.list       |   4 +--
 .../cassandra/image/kubernetes-cassandra.jar  | Bin 9879 -> 9879 bytes
 examples/cassandra/java/pom.xml               |   4 +--
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/examples/cassandra/image/Dockerfile b/examples/cassandra/image/Dockerfile
index bfb697cc2f4..6a3ec62dbe7 100644
--- a/examples/cassandra/image/Dockerfile
+++ b/examples/cassandra/image/Dockerfile
@@ -16,6 +16,9 @@ FROM google/debian:jessie
 
 COPY cassandra.list /etc/apt/sources.list.d/cassandra.list
 COPY run.sh /run.sh
+COPY cassandra.yaml /cassandra.yaml
+COPY logback.xml /logback.xml
+COPY kubernetes-cassandra.jar /kubernetes-cassandra.jar
 
 RUN gpg --keyserver pgp.mit.edu --recv-keys F758CE318D77295D && \
   gpg --export --armor F758CE318D77295D | apt-key add - && \
@@ -24,20 +27,31 @@ RUN gpg --keyserver pgp.mit.edu --recv-keys F758CE318D77295D && \
   gpg --keyserver pgp.mit.edu --recv-keys 0353B12C && \
   gpg --export --armor 0353B12C | apt-key add - && \
   apt-get update && \
-  apt-get -qq -y install procps  cassandra openjdk-8-jre-headless && \
+  apt-get -qq -y install procps cassandra openjdk-8-jre-headless && \
   chmod a+rx /run.sh && \
   mkdir -p /cassandra_data/data && \
-  chown -R cassandra.cassandra /etc/cassandra /cassandra_data && \
+  mv /logback.xml /etc/cassandra/ && \
+  mv /cassandra.yaml /etc/cassandra/ && \
+  chown -R cassandra: /etc/cassandra /cassandra_data && \
   chmod o+w -R /etc/cassandra /cassandra_data && \
-  rm -rf /var/lib/apt/lists/* && \
-  rm -rf /usr/share/doc/ && \
-  rm -rf /usr/share/doc-base/ && \
-  rm -rf /usr/share/man/ && \
-  rm -rf /tmp/*
+  rm -rf \
+        doc \
+        man \
+        info \
+        locale \
+        /var/lib/apt/lists/* \
+        /var/log/* \
+        /var/cache/debconf/* \
+        common-licenses \
+        ~/.bashrc \
+        /etc/systemd \
+        /lib/lsb \
+        /lib/udev \
+        /usr/share/doc/ \
+        /usr/share/doc-base/ \
+        /usr/share/man/ \
+        /tmp/*
 
-COPY cassandra.yaml /etc/cassandra/cassandra.yaml
-COPY logback.xml /etc/cassandra/logback.xml
-COPY kubernetes-cassandra.jar /kubernetes-cassandra.jar
 
 VOLUME ["/cassandra_data/data"]
 
diff --git a/examples/cassandra/image/cassandra.list b/examples/cassandra/image/cassandra.list
index f82805c7aa1..832c02ab436 100644
--- a/examples/cassandra/image/cassandra.list
+++ b/examples/cassandra/image/cassandra.list
@@ -1,5 +1,5 @@
-deb http://www.apache.org/dist/cassandra/debian 34x main
-deb-src http://www.apache.org/dist/cassandra/debian 34x main
+deb http://www.apache.org/dist/cassandra/debian 35x main
+deb-src http://www.apache.org/dist/cassandra/debian 35x main
 
 # for jre8
 deb http://http.debian.net/debian jessie-backports main
diff --git a/examples/cassandra/image/kubernetes-cassandra.jar b/examples/cassandra/image/kubernetes-cassandra.jar
index e0f62c4ce2e324f0999bdfaa1d768fae18bb4c26..a99e41859584d41544fb989867543b7eb55fdfb4 100644
GIT binary patch
delta 1060
zcmbR4JKdKzz?+$civa`<#ciF)tHOK`NSVx50a6}dVJN{2q%-sN5z0a8J}ZHgPnKZR
z0nwY?8AF-CjQPx*5XNfOgN$I2eD==}Mk?nU2qT1>OOP38=j22gEim0DV-2Ry$OH)O
z1={X+X7OAFptbGX3=B35lND8!CI`sM)!)v$<seY|J=|xpor+MLvtI6%C=V0Q=+%M~
znKGvwPqm%lduH9{-E9k2{l9n6?8pRZ{=g}pn##YuIb&(OdHRRu_tgbUHqV@R^2EV!
z7x~_pMYDf!ey!r#F(qLh`|_X#n<SjqC7C>M<CxpS{cCla)CcL_sZj^@vJZWe*%0cR
z`?jWa@>^MNHYwS;CDrPa?c~(!moSF$-<=};MPb@CNy`&=z1qZ<cx1{tSU%#~W@Xz^
z75!oD<?brp9X-G7&+Gk?izz#I-uiA`$))Da#THht<=p?iSmV9;{e_ot2iLEtzQeHO
zPk_jt(`V+`22S~WC-KaJ_Rnt~ZAvq^qAELk;RI(*k11Y7^AuF7n%pLeow(4mbnbQY
z^Fli%f-I-??M{l}i1IZ4T(kde>&%PSHDYcv|7uN^O^z~kte$TgY0MLrqpD+Qb$-zf
zUDMr`TP91(E7t3F-Q{XN>2<?V?=n|J&t?<<C7Zran^k&s$GNmK>MQ<Kt`GVywLj+5
zgmb4pu}-%w`_OQUD<H#kif3Ne75h2*24T<L6i(XkG{5>?xZtsxV>r|5_w9ns=}v72
ztDMB9X%!|0Jl!f2=p3MI*|~L3+e$ySm^&MOf7)^*PGZe$?fO#j_@$c1cvdn`jVRr1
za{iiy{;d~Q;g{ByUKI*i9oAaCs_yiyx0|m8FXh&ib-S^QP1XHrxo&d5VeL#i*~pwD
z#}A44#fNNc_+{g3E)YEBf$!EEB|GZ(HcnuA{@EvQ$s=Ryipi1+iEKN+dp+;oKDj|b
zloOcPJPHpr@#RgPrw~xTm+O!N55t4M^OP>!d>m9i!O7fF#_A>alD!)4it3(GFK*vH
z`?h)g&dnPp6}J^OH-=5SU~{rO?}Cy-+4JD(eFk^pE~xEknR?Z0s$6oHgk9A1_sZXw
z9{ZV9sAN28jfltIJ(-{WK1)pzE!%eZe|>;ABa;X-Jez?s*5o`z190Y9sAvzSA1msC
zX%QtOFzu;i1ExEaqQLZ1DD9-20Ol`MP6E?hD)C@CM<oKBeU7VGfoT?1Z!jICn!pLq
hPLp@5CMv+g0qBfMAa({~7+BKSqX5lnl9S8T6aYC0%?bbj

delta 1059
zcmbR4JKdKzz?+$civa|zeAiFpRbjRSQYN!ifRqPV7)me$>CAk6gmRF&&q^TWlO-5+
zK=fvJ#!x0OV?Hw{gt40SAR|~LpZzn0k;?f7!U*B!5@ZJ2IXO{A3rzRPScB;^G66zg
zqSks8FhxF=2U^?C&A?#8Fj-MmX>x$9T>X9j+Xe!4=i>{Vs~I{iL{7DBTM@*b)7=);
zIZaV6_W3NSAnO}`-llKs@0)shN7a30RJ=C**z@z{_sh%w3D$k6<?kysGd7a6ykU2*
z@$cSaihnLxc?v42&Uk)srpOANV-r?O@a_<FvVPq3Z`I7$AHB!C)+Wq<d+?jghEU(!
zw>7Pk-^zNkiOJ3{t6DzUPENf(MSP9iE=}_njyh|Nize)z%A@Ns@sd?T(Gk&{t<?fw
zw>^m7E&jFaq0y`VZ{oh#?#P)xf4lYH7hBlx7F)b4^IKGR<?V$R)?2K@KWM+2^M)y?
zPJ`=SYTCJZ8mB7X8Khk}Tv=8aX)N(-Qs3Et6AMLDyi_gy1%zxJ7khB0WE{J6?zMS(
zXAI9u8Smq<hI%Y(m&~l(cmLC&GcU45);(qXduU^y;o4aXuBKGy=<|f-sOlJ6onN#=
z)pWPzrpeOsiuJul-%?cHC``{})j1Y9OFigjwfEUwSuyFx&xAw%?FnC5-5al0>5-oL
zv*|RWbxN;kmbSyfs{v{|HG}>a>^l%KSGrN<vj)$q_s1LiX0ya{uGuH=#xsvolI=BT
zWW=f?t&UT#7rF2{_C8U$_DO1)m1IHT;diGmC$J}O$Xoa4YV4G_WfI0q_(GDdzP)4<
z{diBt;@2^r+pmRs2ds?}eYf(LZua$*-sN86QC2-0TzS3vPQ8yhCYSunsMc!JjgJ0S
z%{lv4Br$%ioRz1rOyl6}tc@=>RPJq@!1VmHPu`M8#@02Hr4$m`Di6$BzkJQ)Mg>t$
zP>P=a=WA~M<oOB#^#{2Q8SpS%sNS!%VYBK~-;xcp6|CPZv7fLu@RY*TC9-ec-#vS~
z`MOO+#L9w}%Jxn(vFkRgW$q}JG;H6;Tib4MH@@IlL80{Or8>?ZUR<m-x&B_Feahb|
z)BO`9Jwu9?sP4_wJifLxO;j&u`Tze60p5&EBFyk?2FzHKa}^Ci8DsK7MSC#)SWyp5
zizpd^X-_2^Fx{aP1*V@uX(#0bFn_6X5}4*vi3ig;DiPq^b6mv=OtYwZgXtjE1WtHv
in!H;zQ2`zfz#Lr(#Lmzh4x*Mcb}K-0n&jkiH3a~sjkf9l

diff --git a/examples/cassandra/java/pom.xml b/examples/cassandra/java/pom.xml
index 4c9824f9a9d..a18969ccca2 100644
--- a/examples/cassandra/java/pom.xml
+++ b/examples/cassandra/java/pom.xml
@@ -17,7 +17,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.k8s.cassandra</groupId>
     <artifactId>kubernetes-cassandra</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <build>
         <plugins>
             <plugin>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.cassandra</groupId>
             <artifactId>cassandra-all</artifactId>
-            <version>3.4</version>
+            <version>3.5</version>
             <scope>provided</scope>
         </dependency>