Replace baselines of SDC dockers

[sdc.git] / sdc-os-chef / sdc-backend / Dockerfile

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" ]