From 0a89f59cda65da8f64bd5faf12cf6abb28386aeb Mon Sep 17 00:00:00 2001
From: Areli Fuss <af732p@att.com>
Date: Mon, 11 Sep 2017 10:27:29 +0300
Subject: Replace baselines of SDC dockers

Replace the FROM definition to include
SDB baseline dockers and clean relevant
commands

Change-Id: I0d8659d80daef8a1abb6213f7d4d469e46a37862
Issue-Id: SDC-306
Signed-off-by: Areli Fuss <af732p@att.com>
---
 sdc-os-chef/sdc-cassandra/Dockerfile | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'sdc-os-chef/sdc-cassandra')

diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile
index 7af6de1de4..6066aeb453 100644
--- a/sdc-os-chef/sdc-cassandra/Dockerfile
+++ b/sdc-os-chef/sdc-cassandra/Dockerfile
@@ -1,30 +1,11 @@
-FROM cassandra:2.1.17
-
-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 
-
-#ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get -y update && apt-get -y install --no-install-recommends \
-    curl   \
-    vim \
-    apt-utils  \
-    openjdk-8-jdk
-
-RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
+FROM openecomp/base_sdc-cassandra: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" ]
-- 
cgit 1.2.3-korg