Revert "Support SIP TLS"

[sdc.git] / openecomp-be / dist / sdc-onboard-backend-docker / artifacts / Dockerfile

diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
index acc84ab..6eb57a6 100644 (file)
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
@@ -1,15 +1,48 @@
-FROM onap/base_sdc-jetty:1.6.0
+FROM onap/integration-java11:9.0.0
 
-COPY --chown=jetty:jetty chef-solo ${JETTY_BASE}/chef-solo/
+USER root
+ARG JETTY_FOLDER=/app/jetty
 
-COPY --chown=jetty:jetty chef-repo/cookbooks ${JETTY_BASE}/chef-solo/cookbooks/
+# Install Chef
+RUN set -ex && \
+    apk update && \
+    apk add --no-cache \
+        wget \
+        build-base \
+        ruby \
+        ruby-dev \
+        libffi-dev \
+        libxml2-dev \
+        libressl-dev && \
+    gem install public_suffix -v 4.0.7 --no-document && \
+    gem install multipart-post -v 2.2.0 --no-document && \
+    gem install etc -v 1.3.0 --no-document && \
+    gem install bundler -v 2.3.26 --no-document && \
+    gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 webrick --no-document && \
+    gem cleanup && \
+    apk update
 
-ADD --chown=jetty:jetty onboarding-be-*.war    ${JETTY_BASE}/webapps/
+ENV JETTY_HOME=$JETTY_FOLDER
+ENV JETTY_BASE=$JETTY_FOLDER
+ENV JETTY_USER=onap
+ENV JETTY_GROUP=onap
 
-ADD --chown=jetty:jetty api-docs.war           ${JETTY_BASE}/webapps/
+RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER
 
-COPY --chown=jetty:jetty startup.sh ${JETTY_BASE}/ 
+USER onap
 
-RUN chmod 770 ${JETTY_BASE}/startup.sh
+#Download jetty
+RUN wget 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 -c && \
+        tar xvz -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
 
-ENTRYPOINT ${JETTY_BASE}/startup.sh
+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 onboarding-be-*.war    $JETTY_FOLDER/webapps/
+ADD --chown=onap:onap api-docs.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"]