From 7d3db85d84645d20dd69aeba3e020d3d4769a086 Mon Sep 17 00:00:00 2001
From: Werner <sky.captin@gmail.com>
Date: Wed, 17 May 2017 15:57:20 +0200
Subject: [PATCH] Fixed the cassandra docker image cassandra mirror detection
 logic bumped cassandra to v3.10, as v3.9 is no longer on the mirrors bumped
 ubuntu-slim to v0.9

---
 examples/storage/cassandra/image/Dockerfile   |  29 +++++++++---------
 examples/storage/cassandra/image/Makefile     |   3 +-
 .../image/files/kubernetes-cassandra.jar      | Bin 9841 -> 9843 bytes
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/examples/storage/cassandra/image/Dockerfile b/examples/storage/cassandra/image/Dockerfile
index d14401b8f7..45b7595123 100644
--- a/examples/storage/cassandra/image/Dockerfile
+++ b/examples/storage/cassandra/image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/google_containers/ubuntu-slim:0.6
+FROM gcr.io/google_containers/ubuntu-slim:0.9
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -42,12 +42,12 @@ ADD files /
 
 RUN set -e && echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
   && apt-get update && apt-get -qq -y --force-yes install --no-install-recommends \
-	openjdk-8-jre-headless \
-	libjemalloc1 \
-	localepurge \
-	wget && \
+    openjdk-8-jre-headless \
+    libjemalloc1 \
+    localepurge \
+    wget && \
   mirror_url=$( wget -q -O - http://www.apache.org/dyn/closer.cgi/cassandra/ \
-        | sed -n 's#.*href="\(http://ftp.[^"]*\)".*#\1#p' \
+        | sed -n 's#.*href="\(http://.*/cassandra\/[^"]*\)".*#\1#p' \
         | head -n 1 \
     ) \
     && wget -q -O - ${mirror_url}/${CASSANDRA_VERSION}/apache-cassandra-${CASSANDRA_VERSION}-bin.tar.gz \
@@ -64,7 +64,7 @@ RUN set -e && echo 'debconf debconf/frontend select Noninteractive' | debconf-se
     && chown cassandra: /ready-probe.sh \
     && if [ -n "$DEV_CONTAINER" ]; then apt-get -y --no-install-recommends install python; else rm -rf  $CASSANDRA_HOME/pylib; fi \
     && apt-get -y purge wget localepurge \
-    && apt-get autoremove \
+    && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf \
         $CASSANDRA_HOME/*.txt \
@@ -73,12 +73,12 @@ RUN set -e && echo 'debconf debconf/frontend select Noninteractive' | debconf-se
         $CASSANDRA_HOME/tools/*.yaml \
         $CASSANDRA_HOME/tools/bin/*.bat \
         $CASSANDRA_HOME/bin/*.bat \
-	doc \
-	man \
-	info \
-	locale \
-	common-licenses \
-	~/.bashrc \
+    doc \
+    man \
+    info \
+    locale \
+    common-licenses \
+    ~/.bashrc \
         /var/lib/apt/lists/* \
         /var/log/* \
         /var/cache/debconf/* \
@@ -116,7 +116,8 @@ RUN set -e && echo 'debconf debconf/frontend select Noninteractive' | debconf-se
         /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/ext/nashorn.jar \
         /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/oblique-fonts \
         /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/plugin.jar \
-	/usr/lib/jvm/java-8-openjdk-amd64/man
+        /usr/lib/jvm/java-8-openjdk-amd64/man
+
 
 VOLUME ["/$CASSANDRA_DATA"]
 
diff --git a/examples/storage/cassandra/image/Makefile b/examples/storage/cassandra/image/Makefile
index 3143d5ce24..ac8ef75e06 100644
--- a/examples/storage/cassandra/image/Makefile
+++ b/examples/storage/cassandra/image/Makefile
@@ -16,7 +16,7 @@
 VERSION=v12
 PROJECT_ID?=google_samples
 PROJECT=gcr.io/${PROJECT_ID}
-CASSANDRA_VERSION=3.9
+CASSANDRA_VERSION=3.10
 
 all: kubernetes-cassandra.jar build
 
@@ -26,6 +26,7 @@ kubernetes-cassandra.jar: ../java/* ../java/src/main/java/io/k8s/cassandra/*.jav
 	cd ../java && mvn clean
 
 container:
+	@echo "Building ${PROJECT}/cassandra:${VERSION}"
 	docker build --pull --build-arg "CASSANDRA_VERSION=${CASSANDRA_VERSION}" -t ${PROJECT}/cassandra:${VERSION} .
 
 container-dev:
diff --git a/examples/storage/cassandra/image/files/kubernetes-cassandra.jar b/examples/storage/cassandra/image/files/kubernetes-cassandra.jar
index c639d56d0e5d9092b429c73a6e25efe8dce46b63..ed2621975a4703a31ede77bd5f3f537f3a9fe720 100644
GIT binary patch
delta 893
zcmez9^Vx?tz?+$civa}K%QjBrRpDhT+vsJ&RoRsX6l$4h7g&F(+vu{_smh&mx`Twh
zgMtqv^|5xIlw8TRuQPRJCD*a4V^z}xWHooiY2H-u*7?Hoh_{!ga%aU(2878VBf(Zc
z31%RjnXivq0XsxNwnediz+@gqPG+D9lO-5+K=fvJ#y5;$2A@PI6PS@EwV#odg8?LI
z#{3x~sl$3%04&KQ#?HhF_T6MH87*d@FDHk~ScB=QG6Br11A8{VkZETI`}_F88|nE#
zyQ?PGDEQSk8wfC5u#GQ#aOVN5qo9n{R6aj3tNG8OnhGZF*7)(g^!1O5tIe%bx!h;?
zOT0`dy!!i+hk63{jW52}lN(;z?NzvPV^{OlplOV?Z<~K--P@in6Z9=Ry-v}1(uyY@
z-oGvct&9FXGjzv>yZ`<(2Y53wi7><C0UTPBJr(s)V`FlwqAAEvllLl0O8j*^4hu$v
zUXbKFMM=xQjxUgc5Xo?$0+gr_1S*370fxVhyo{3t#e{Vbt^o(CSE%?;zqyPI3@@1&
z7))U5f%KL}8;}OA$qkG={AijcKU9`v+0v-Z3|63_A`Eu8oeD^>nH4NJUy2vQs?&Eq
zR4oKr^%iKAIf_;8?2{iVxhjA>FzxB&tK9+&3?G#k7<5q-*>VC+)|{NLECg1#=jPYg
z{Xo;)fGJKNMWL|N<b}%C&~&j-MVe85@?I4=aH_bcBF*F@Gr3VgX|k*;4_HV?Rhp>_
zBxF9h0Vo7aGn4yOK|Z+)611NDT$LYeA3Xg4?Q%x3FI@qs&~<XOngE-*B1i@R>E`*r

delta 930
zcmezD^U;Slz?+$civa`_`J*QCs_-iCM|quHq_92*DAY93F0g)5@u$;4l{@Ej2MK!z
z1s`zgW9>XCxsq#NXX?sIu47fls-_9>YVL~Dys2QV^M&V;E^p<|ik%Dyb3q1zEr1ft
zKsqyDAGZQ_h=Od3VvwTA0*vg;Kr<#wG3tQm&7O>J7{QDX_RkQ87w2UGu!w>bI}<Ah
z14xwxb0`y7Yy#_kMpm%zChN#(F#~-$Ia0<NOiz~yVD1$5+x$wVof+)!ThXri`9Rw%
zC)X+X)gLktV7Oo#UwC2XL!lK@ozxdTda$JKz*0+95xpW$u77*;_I)i)7Ykb@qgeC6
z%ewnzo^QfKhJOq%mL<*+cvxuP=x#o1?$#wbn>T0dt<21O?>#4Y+wF}vrg|xMdbMp?
zroQ%Tc{KN$LsPx~{|EY$kx7IZ9uMH~n(VEpj~W}3+Z9bgeww^rQBvZq<55^ZBJ_eJ
zKPXCCymfqr9Ed0iP$EMRs0;!G7~VQ^Pj*yNkOvy#6)OJIZ!RMP!%HRx1{0VPAibo~
z3aCb8at^21<W)+N3Lv$o?|i6Q2vqwPsMZ`sttRv2MkTGuXO*SF&VH>d$+DzTo)svl
zX{48&lUQ7g@HjZyy!PDu8oM88mK!jY=%bkRRTOMiuZo}&MCtTazKPsGD;-$Sl`=|z
zmGUYJgWdOL!NG%tATxoAO;OB@lmaWvQWjSPrx28&;fE^~VEF%EcJh7|IdH0Zpd!ua
zHF>S7@??2c9<Yd>sx)H<P{e{C**n0LHF=_{B=eHS+dw&Quv6d(3~079+<Z{5rYcNc
Vr)oWUp90t9STzAQQ=o$w7yuQE=(PX<