summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshrek2000 <oren.kleks@amdocs.com>2019-10-29 09:38:53 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-10-29 13:12:25 +0000
commitc0e96b55b3b71a69d0cfe47908a2e5c0ee7e4bae (patch)
treeed6302c34cf29d00245829b767d9972ce2514890
parent6cdcb857261019e1dbd154fe6f27a68b124cfb4a (diff)
Upgrade to Cassandra 3
Creating base dockers suitable for Cassandra 3 Issue-ID: SDC-2594 Signed-off-by: shrek2000 <oren.kleks@amdocs.com> Change-Id: I9e62cca2b7ef348bf68f28f74ec0a49c350f93e8 Signed-off-by: shrek2000 <oren.kleks@amdocs.com>
-rw-r--r--base_sdc-cassandra/Dockerfile2
-rw-r--r--base_sdc-cqlsh/Dockerfile5
-rw-r--r--pom.xml4
3 files changed, 7 insertions, 4 deletions
diff --git a/base_sdc-cassandra/Dockerfile b/base_sdc-cassandra/Dockerfile
index 6dddaa7..4885e19 100644
--- a/base_sdc-cassandra/Dockerfile
+++ b/base_sdc-cassandra/Dockerfile
@@ -1,4 +1,4 @@
-FROM cassandra:2.1.17
+FROM cassandra:3.11.4
# Upgrade specific system libraries to fix CVE vulnerabilities
# avahi 0.7-3.1
diff --git a/base_sdc-cqlsh/Dockerfile b/base_sdc-cqlsh/Dockerfile
index 7cc7566..5ed1299 100644
--- a/base_sdc-cqlsh/Dockerfile
+++ b/base_sdc-cqlsh/Dockerfile
@@ -1,7 +1,9 @@
FROM openjdk:8-jdk-alpine
RUN apk add --no-cache py-pip && \
- pip install cqlsh==4.0.1 && \
+ pip install cqlsh==5.0.4 && \
+ mkdir ~/.cassandra/ && \
+ echo '[cql]\n version=3.4.4' >> ~/.cassandra/cqlshrc && \
set -ex && \
pip install cqlsh && \
apk add --no-cache \
@@ -15,3 +17,4 @@ RUN apk add --no-cache py-pip && \
apk update && \
apk add binutils \
libtasn1
+
diff --git a/pom.xml b/pom.xml
index 3784652..cab2156 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.onap.sdc.sdc-docker-base</groupId>
<artifactId>sdc-docker-base</artifactId>
<packaging>pom</packaging>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>sdc-sdc-docker-base</name>
<parent>
@@ -31,7 +31,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.25.2</version>
+ <version>0.26.0</version>
<configuration>
<images>
<!-- base_sdc-jetty for backend and frontend -->