diff options
Diffstat (limited to 'sdc-os-chef/sdc-frontend')
| -rw-r--r-- | sdc-os-chef/sdc-frontend/Dockerfile | 28 |
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/ |