summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-03-01 10:05:34 +0200
committerMichael Lando <ml636r@att.com>2017-03-01 10:05:34 +0200
commit36771967c477f75206e15555f839ac23900172be (patch)
tree88aefe3e3c3cc86cae549dbbf357bcebfad355ae
parentfee04500a09b477c20f028b351e2ca0762d0b4dc (diff)
uncomment es docker creation
Change-Id: Ia49373d07564e32c7db4bcea24abe7a4d317734c Signed-off-by: Michael Lando <ml636r@att.com>
-rw-r--r--sdc-os-chef/pom.xml4
-rw-r--r--webseal-simulator/Dockerfile20
2 files changed, 22 insertions, 2 deletions
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 36bc3c1e71..150b52f54f 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -148,14 +148,14 @@
</image>
<!-- Build elastic search image -->
- <!--<image>
+ <image>
<name>openecomp/sdc-elasticsearch:%l</name>
<alias>sdc-elasticsearch</alias>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/sdc-elasticsearch</dockerFileDir>
</build>
- </image>-->
+ </image>
<!-- Build kibana image -->
<image>
diff --git a/webseal-simulator/Dockerfile b/webseal-simulator/Dockerfile
new file mode 100644
index 0000000000..9d01611dc9
--- /dev/null
+++ b/webseal-simulator/Dockerfile
@@ -0,0 +1,20 @@
+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
+
+
+
+
+
+ADD ./../target/WSSimulator.war ${JETTY_BASE}/webapps/
+RUN chown -R jetty:jetty ${JETTY_BASE}/webapps
+ADD ./
+
+COPY startup.sh /root/
+
+RUN chmod 770 /root/startup.sh
+
+ENTRYPOINT [ "/root/startup.sh" ]