diff --git a/examples/storage/cassandra/image/Dockerfile b/examples/storage/cassandra/image/Dockerfile index d14401b8f76..45b75951235 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 3143d5ce24b..ac8ef75e063 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 c639d56d0e5..ed2621975a4 100644 Binary files a/examples/storage/cassandra/image/files/kubernetes-cassandra.jar and b/examples/storage/cassandra/image/files/kubernetes-cassandra.jar differ