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>

diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile
index 7054cc1..9052e74 100644 (file)
--- a/sdc-os-chef/sdc-backend/Dockerfile
+++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -1,36 +1,21 @@
-FROM jetty:9.3-jre8
+FROM openecomp/base_sdc-backend:1.0.0-SNAPSHOT-latest
 
-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 
+COPY chef-solo /root/chef-solo/
 
+COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
 
-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 apt-get -y install jq
-RUN apt-get -y install python libssl-dev libcurl4-openssl-dev python-dev gcc
+#RUN python /root/chef-solo/cookbooks/sdc-normatives/files/default/get-pip.py
 
-COPY chef-solo /root/chef-solo/
-COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
+ADD onboarding-be-*.war        ${JETTY_BASE}/webapps/
 
-RUN python /root/chef-solo/cookbooks/sdc-normatives/files/default/get-pip.py
-RUN pip install pycurl
+ADD catalog-be-*.war           ${JETTY_BASE}/webapps/
 
-# install chef-solo
-RUN curl -L https://omnitruck.chef.io/install.sh | bash
+ADD api-docs.war              ${JETTY_BASE}/webapps/
 
-ADD onboarding-be-*.war                        ${JETTY_BASE}/webapps/
-ADD catalog-be-*.war                           ${JETTY_BASE}/webapps/
-ADD api-docs.war                                  ${JETTY_BASE}/webapps/
-RUN chown -R jetty:jetty                       ${JETTY_BASE}/webapps
+RUN chown -R jetty:jetty       ${JETTY_BASE}/webapps
 
 COPY startup.sh /root/
+
 RUN chmod 770 /root/startup.sh
+
 ENTRYPOINT [ "/root/startup.sh" ]

diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile
index 7af6de1..6066aeb 100644 (file)
--- 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" ]

diff --git a/sdc-os-chef/sdc-elasticsearch/Dockerfile b/sdc-os-chef/sdc-elasticsearch/Dockerfile
index 89516a6..60db8e5 100644 (file)
--- 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" ]

diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile
index c59d9e2..7f9207d 100644 (file)
--- a/sdc-os-chef/sdc-frontend/Dockerfile
+++ b/sdc-os-chef/sdc-frontend/Dockerfile
@@ -1,30 +1,16 @@
-FROM jetty:9.3-jre8
-
-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
+FROM openecomp/base_sdc-frontend: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/
 
 RUN cp ${JETTY_HOME}/resources/log4j.properties ${JETTY_BASE}/resources/log4j.properties
 
-ADD onboarding*.war                    ${JETTY_BASE}/webapps/
-ADD catalog-fe-*.war     ${JETTY_BASE}/webapps/
-RUN chown -R jetty:jetty               ${JETTY_BASE}/webapps
+ADD onboarding*.war         ${JETTY_BASE}/webapps/
+
+ADD catalog-fe-*.war        ${JETTY_BASE}/webapps/
+
+RUN chown -R jetty:jetty    ${JETTY_BASE}/webapps
 
 COPY startup.sh /root/
 

diff --git a/sdc-os-chef/sdc-kibana/Dockerfile b/sdc-os-chef/sdc-kibana/Dockerfile
index a42225a..6a058de 100644 (file)
--- a/sdc-os-chef/sdc-kibana/Dockerfile
+++ b/sdc-os-chef/sdc-kibana/Dockerfile
@@ -1,23 +1,8 @@
-FROM kibana:4.3.3
-
-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 curl
-RUN apt-get -y install vim
+FROM openecomp/base_sdc-kibana: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/
 

diff --git a/sdc-os-chef/sdc-sanity/Dockerfile b/sdc-os-chef/sdc-sanity/Dockerfile
index 9dd8291..ea137b4 100644 (file)
--- a/sdc-os-chef/sdc-sanity/Dockerfile
+++ b/sdc-os-chef/sdc-sanity/Dockerfile
@@ -1,27 +1,11 @@
-FROM ubuntu:16.04
-
-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 apt-get -y update && \
-    apt-get -y install --no-install-recommends apt-utils && \
-    apt-get install curl \
-                    default-jre 
-                    openjdk-8-jdk
-                    vim && \
-    update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-    if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi 
+FROM openecomp/base_sdc-sanity: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" ]