Support SIP TLS

[sdc.git] / catalog-fe / sdc-frontend / Dockerfile

diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index 66aea7b..341dda2 100644 (file)
--- a/catalog-fe/sdc-frontend/Dockerfile
+++ b/catalog-fe/sdc-frontend/Dockerfile
@@ -1,17 +1,47 @@
-FROM onap/base_sdc-jetty:1.6.0
-
-RUN mkdir -p ${JETTY_BASE}/config/catalog-fe
-
-COPY --chown=jetty:jetty chef-solo ${JETTY_BASE}/chef-solo/
-
-COPY --chown=jetty:jetty chef-repo/cookbooks ${JETTY_BASE}/chef-solo/cookbooks/
-
-ADD --chown=jetty:jetty onboarding*.war         ${JETTY_BASE}/webapps/
-
-ADD --chown=jetty:jetty catalog-fe-*.war        ${JETTY_BASE}/webapps/
-
-COPY --chown=jetty:jetty startup.sh ${JETTY_BASE}
-
-RUN chmod 770 ${JETTY_BASE}/startup.sh
-
-ENTRYPOINT ${JETTY_BASE}/startup.sh
+FROM onap/integration-java11:10.0.0
+
+USER root
+ARG JETTY_FOLDER=/app/jetty
+
+# Install Chef
+RUN set -ex && \
+    apk update && \
+    apk add --no-cache \
+        build-base \
+        ruby \
+        ruby-dev \
+        libffi-dev \
+        libxml2-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
+
+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 https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
+        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
+
+RUN mkdir -p $JETTY_FOLDER/config/catalog-fe
+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*.war         $JETTY_FOLDER/webapps/
+ADD --chown=onap:onap  catalog-fe-*.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"]