summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOfir Sonsino <os0695@intl.att.com>2020-03-04 22:14:18 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-03-22 12:53:19 +0000
commit3be455939771b8b45368266febe6ec8b983393b1 (patch)
tree6d7f95d5999d7cc5f5e3e1054fe99251f42fe6d4
parent98fe89e68abcbe1627d91f875a512cdbe410accc (diff)
Remove elasticsearch base
Change-Id: I6ea767e9812e4c895c5b7a61b242f5bc7bd67032 Issue-ID: SDC-2724 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
-rw-r--r--base_sdc-elasticsearch/Dockerfile20
-rw-r--r--pom.xml17
2 files changed, 2 insertions, 35 deletions
diff --git a/base_sdc-elasticsearch/Dockerfile b/base_sdc-elasticsearch/Dockerfile
deleted file mode 100644
index edf724f..0000000
--- a/base_sdc-elasticsearch/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM elasticsearch:2.4.6-alpine
-
-RUN mkdir -p /var/chef/nodes
-
-# Install Chef
-RUN set -ex && \
- apk add --no-cache \
- linux-headers \
- curl \
- vim \
- bash \
- build-base \
- ruby=2.5.7-r0 \
- ruby-dev \
- libffi-dev \
- libxml2-dev && \
- gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \
- echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
- apk update && \
- apk add binutils curl libcurl libtasn1
diff --git a/pom.xml b/pom.xml
index 78a28ee..5cab49a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,19 +87,6 @@
<dockerFileDir>${project.basedir}/base_sdc-python</dockerFileDir>
</build>
</image>
- <!--base_sdc-elasticsearch-->
- <image>
- <name>onap/base_sdc-elasticsearch</name>
- <alias>base_sdc-elasticsearch</alias>
- <build>
- <cleanup>true</cleanup>
- <tags>
- <tag>${docker.tag}</tag>
- <tag>${docker.latest.tag}</tag>
- </tags>
- <dockerFileDir>${project.basedir}/base_sdc-elasticsearch</dockerFileDir>
- </build>
- </image>
<!--base_sdc-sanity-->
<image>
<name>onap/base_sdc-sanity</name>
@@ -138,7 +125,7 @@
<configuration>
<removeAll>true</removeAll>
<image>
- onap/base_sdc-jetty,onap/base_sdc-elasticsearch,onap/base_sdc-cassandra,onap/base_sdc-sanity,onap/base_sdc-cqlsh,onap/base_sdc-python,onap/base_sdc-vnc
+ onap/base_sdc-jetty,onap/base_sdc-cassandra,onap/base_sdc-sanity,onap/base_sdc-cqlsh,onap/base_sdc-python,onap/base_sdc-vnc
</image>
</configuration>
</execution>
@@ -159,7 +146,7 @@
</goals>
<configuration>
<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,onap/base_sdc-python,onap/base_sdc-vnc
+ onap/base_sdc-jetty,onap/base_sdc-kibana,onap/base_sdc-cassandra,onap/base_sdc-sanity,onap/base_sdc-cqlsh,onap/base_sdc-python,onap/base_sdc-vnc
</image>
</configuration>
</execution>