X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdc-os-chef%2Fsdc-elasticsearch%2FDockerfile;h=60db8e5b6b9a01ac52eb207cbd3b77c5d3e378d6;hb=0a89f59cda65da8f64bd5faf12cf6abb28386aeb;hp=89516a6727bd25f91259170f8b0c26a776808cdf;hpb=3fdfcedf215e4e93a2b603fca20b4fbac8b491e3;p=sdc.git

diff --git a/sdc-os-chef/sdc-elasticsearch/Dockerfile b/sdc-os-chef/sdc-elasticsearch/Dockerfile
index 89516a6727..60db8e5b6b 100644
--- a/sdc-os-chef/sdc-elasticsearch/Dockerfile
+++ b/sdc-os-chef/sdc-elasticsearch/Dockerfile
@@ -1,27 +1,11 @@
-FROM elasticsearch:2.1.2
-
-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 && \
-    if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi 
-
-RUN apt-get -y update
-RUN apt-get -y install apt-utils
-RUN apt-get -y install curl
-RUN apt-get -y install vim
-RUN mkdir -p /var/chef/nodes
+FROM openecomp/base_sdc-elasticsearch:1.0.0-SNAPSHOT-latest
 
 COPY chef-solo /root/chef-solo/
-COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
 
-# install chef-solo
-RUN curl -L https://omnitruck.chef.io/install.sh | bash
+COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
 
 COPY startup.sh /root/
+
 RUN chmod 770 /root/startup.sh
 
 ENTRYPOINT [ "/root/startup.sh" ]