Replace baselines of SDC dockers

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

diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile
index 940dd23..7f9207d 100644 (file)
--- a/sdc-os-chef/sdc-frontend/Dockerfile
+++ b/sdc-os-chef/sdc-frontend/Dockerfile
@@ -1,24 +1,16 @@
-FROM jetty:9.3.15-jre8
-
-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 http://www.opscode.com/chef/install.sh | bash
-COPY chef-install.sh /root/
-RUN chmod 770 /root/chef-install.sh
-RUN bash /root/chef-install.sh
+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-__SDC-RELEASE__.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/