From: Yuli Shlosberg <ys9693@att.com>
Date: Mon, 29 Jan 2018 14:19:52 +0000 (+0200)
Subject: new cqlsh base docker
X-Git-Tag: 2.0.0-ONAP~25
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e11dc23a5fd4dbcf38a5496f093be00e1d568217;p=sdc%2Fsdc-docker-base.git

new cqlsh base docker

Change-Id: I1d771f80e87eeeac55cfd0df55af011bee307753
Issue-ID: SDC-722
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
---

diff --git a/base_sdc-cqlsh/Dockerfile b/base_sdc-cqlsh/Dockerfile
new file mode 100644
index 0000000..41daef7
--- /dev/null
+++ b/base_sdc-cqlsh/Dockerfile
@@ -0,0 +1,20 @@
+FROM openjdk:8-jdk-alpine
+
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
+
+ENV HTTP_PROXY  ${HTTP_PROXY}
+ENV HTTPS_PROXY ${HTTPS_PROXY}
+
+RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy  \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi
+RUN if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
+
+RUN  apk add --no-cache \
+     py-pip
+
+RUN pip install cqlsh==4.0.1
+
+# Install Chef
+RUN set -ex && \
+    apk add --no-cache bash build-base ruby ruby-dev libffi-dev libxml2-dev && \
+    gem install chef berkshelf io-console --no-document
diff --git a/pom.xml b/pom.xml
index b836126..8cf235f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,19 @@
                             <dockerFileDir>${project.basedir}/base_sdc-cassandra</dockerFileDir>
                         </build>
                     </image>
+                    <!-- base_sdc-cassandra  -->
+                    <image>
+                        <name>onap/base_sdc-cqlsh</name>
+                        <alias>base_sdc-cqlsh</alias>
+                        <build>
+                            <cleanup>true</cleanup>
+                            <tags>
+                                <tag>${docker.tag}</tag>
+                                <tag>${docker.latest.tag}</tag>
+                            </tags>
+                            <dockerFileDir>${project.basedir}/base_sdc-cqlsh</dockerFileDir>
+                        </build>
+                    </image>
                     <!-- base_sdc-elasticsearch  -->
                     <image>
                         <name>onap/base_sdc-elasticsearch</name>
@@ -114,7 +127,7 @@
                     </goals>
                     <configuration>
                         <removeAll>true</removeAll>
-                        <image>onap/base_sdc-jetty,onap/base_sdc-elasticsearch,onap/base_sdc-kibana,onap/base_sdc-cassandra,onap/base_sdc-sanity</image>
+                        <image>onap/base_sdc-jetty,onap/base_sdc-elasticsearch,onap/base_sdc-kibana,onap/base_sdc-cassandra,onap/base_sdc-sanity,onap/base_sdc-cqlsh</image>
                     </configuration>
                 </execution>
 
@@ -133,7 +146,7 @@
                         <goal>push</goal>
                     </goals>
                     <configuration>
-                        <image>onap/base_sdc-jetty,onap/base_sdc-elasticsearch,onap/base_sdc-kibana,onap/base_sdc-cassandra,onap/base_sdc-sanity</image>
+                        <image>onap/base_sdc-jetty,onap/base_sdc-elasticsearch,onap/base_sdc-kibana,onap/base_sdc-cassandra,onap/base_sdc-sanity,onap/base_sdc-cqlsh</image>
                     </configuration>
                 </execution>
             </executions>