X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=utils%2Fwebseal-simulator%2Fsdc-simulator%2FDockerfile;h=c3758e1cbd9c2bbdeb577a8fda2d070fc2edc2fa;hb=a542f19d421229508c4408583e552c4c0eba84f1;hp=ca74a8148410c6eb4560c31011a8226bf572b84c;hpb=b96e0da8bae19842b4eab733885775cdbfbf59fa;p=sdc.git

diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile
index ca74a81484..c3758e1cbd 100644
--- a/utils/webseal-simulator/sdc-simulator/Dockerfile
+++ b/utils/webseal-simulator/sdc-simulator/Dockerfile
@@ -1,19 +1,42 @@
-FROM onap/base_sdc-jetty:1.4.0-SNAPSHOT-latest
-
-COPY chef-solo /root/chef-solo/
-
-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/
+FROM onap/integration-java11:10.0.0
 
 USER root
-
-RUN chown -R jetty:jetty               		${JETTY_BASE}/webapps
-
-COPY startup.sh /root/
-
-RUN chmod 777 /root/startup.sh
-
-ENTRYPOINT [ "/root/startup.sh" ]
+ARG JETTY_FOLDER=/app/jetty
+
+# Install Chef
+RUN set -ex && \
+    apk update && \
+    apk add --no-cache \
+        wget \
+        build-base \
+        ruby \
+        ruby-dev \
+        libffi-dev \
+        libxml2-dev && \
+    gem install --no-update-sources public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 webrick --no-document && \
+    gem cleanup && \
+    apk update
+
+ENV JETTY_HOME=$JETTY_FOLDER
+ENV JETTY_BASE=$JETTY_FOLDER
+ENV JETTY_USER=onap
+ENV JETTY_GROUP=onap
+
+RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER
+
+USER onap
+
+#Download jetty
+RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz --tries=3 -O $JETTY_FOLDER/jetty.tar.gz && \
+        tar xz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \
+        rm -rf $JETTY_FOLDER/jetty.tar.gz
+RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml
+
+COPY --chown=onap:onap chef-solo $JETTY_FOLDER/chef-solo/
+COPY --chown=onap:onap  chef-repo/cookbooks $JETTY_FOLDER/chef-solo/cookbooks/
+ADD --chown=onap:onap WSSimulator*.war                    	$JETTY_FOLDER/webapps/
+COPY --chown=onap:onap startup.sh $JETTY_FOLDER/
+
+RUN chmod 770 $JETTY_FOLDER/startup.sh
+
+ENTRYPOINT [ "sh", "-c", "${JETTY_HOME}/startup.sh"]