aboutsummaryrefslogtreecommitdiffstats
path: root/utils/webseal-simulator
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-09-22 23:47:09 +0300
committerMichael Lando <ml636r@att.com>2017-09-23 16:03:16 +0300
commit3ef175b5f6e74a685cfa998153b4d635f9883dfe (patch)
tree00bfc6a8b0e5f327f553ca6ff71f44834ef70e76 /utils/webseal-simulator
parent0819f24218af38d1875defe46d233141648c1705 (diff)
add new global types
add global types needed for volte use case Change-Id: I26f2de45d46628c95fd708b7e61b007c214e2c94 Issue-ID: SDC-192 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'utils/webseal-simulator')
-rw-r--r--utils/webseal-simulator/sdc-simulator/Dockerfile21
1 files changed, 3 insertions, 18 deletions
diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile
index 95d452f677..d418d4628e 100644
--- a/utils/webseal-simulator/sdc-simulator/Dockerfile
+++ b/utils/webseal-simulator/sdc-simulator/Dockerfile
@@ -1,28 +1,13 @@
-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 WSSimulator*.war ${JETTY_BASE}/webapps/
+
RUN chown -R jetty:jetty ${JETTY_BASE}/webapps
COPY startup.sh /root/