aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-frontend/Dockerfile
diff options
context:
space:
mode:
authorAreli Fuss <af732p@att.com>2017-09-11 10:27:29 +0300
committerAreli Fuss <af732p@att.com>2017-09-11 10:31:28 +0300
commit0a89f59cda65da8f64bd5faf12cf6abb28386aeb (patch)
tree8319bc8ed294342ee1ca7c15ba53ce0e637255e3 /sdc-os-chef/sdc-frontend/Dockerfile
parent3fdfcedf215e4e93a2b603fca20b4fbac8b491e3 (diff)
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>
Diffstat (limited to 'sdc-os-chef/sdc-frontend/Dockerfile')
-rw-r--r--sdc-os-chef/sdc-frontend/Dockerfile28
1 files changed, 7 insertions, 21 deletions
diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile
index c59d9e21da..7f9207d545 100644
--- 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/