From 6dc58fd625279f8ffe1060170418686034db0af4 Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 2 Oct 2019 12:08:49 +0100 Subject: Fix name convention issue Rename modules: workflow-designer-init to sdc-workflow-designer-init workflow-designer-be to sdc-workflow-designer-be workflow-designer-ui to sdc-workflow-designer-ui Rename docker images: onap/workflow-init to onap/sdc-workflow-init onap/workflow-backend to onap/sdc-workflow-backend onap/workflow-frontend to onap/sdc-workflow-frontend List of changed files: modified: README.md modified: docker-compose/debug.yml modified: docker-compose/docker-compose.yml modified: pom.xml modified: sdc-workflow-bdd/pom.xml modified: sdc-workflow-designer-be/pom.xml modified: sdc-workflow-designer-init/pom.xml modified: sdc-workflow-designer-ui/pom.xml modified: sdc-workflow-designer-ui/src/main/frontend/yarn.lock modified: version.properties All others changes are relaited to rename/move. Change-Id: Ic989b6347b815f85e77e23fc8d7884c05b650a27 Issue-ID: SDC-2334 Issue-ID: SDC-2335 Signed-off-by: Vasyl Razinkov --- sdc-workflow-designer-ui/docker/Dockerfile | 18 ++++++++++++++ sdc-workflow-designer-ui/docker/org.onap.sdc.p12 | Bin 0 -> 4459 bytes .../docker/org.onap.sdc.trust.jks | Bin 0 -> 1413 bytes sdc-workflow-designer-ui/docker/startup.sh | 27 +++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 sdc-workflow-designer-ui/docker/Dockerfile create mode 100644 sdc-workflow-designer-ui/docker/org.onap.sdc.p12 create mode 100644 sdc-workflow-designer-ui/docker/org.onap.sdc.trust.jks create mode 100644 sdc-workflow-designer-ui/docker/startup.sh (limited to 'sdc-workflow-designer-ui/docker') diff --git a/sdc-workflow-designer-ui/docker/Dockerfile b/sdc-workflow-designer-ui/docker/Dockerfile new file mode 100644 index 00000000..58130888 --- /dev/null +++ b/sdc-workflow-designer-ui/docker/Dockerfile @@ -0,0 +1,18 @@ +FROM jetty:9.4-jre8-alpine + +EXPOSE 8080 +EXPOSE 8443 + +USER root + +ARG ARTIFACT + +COPY org.onap.sdc.p12 org.onap.sdc.trust.jks ${JETTY_BASE}/etc/ + +ADD ${ARTIFACT} ${JETTY_BASE}/webapps/ +RUN chown -R jetty:jetty ${JETTY_BASE}/webapps ${JETTY_BASE}/etc/ + +COPY startup.sh . +RUN chmod 744 startup.sh + +ENTRYPOINT [ "./startup.sh" ] diff --git a/sdc-workflow-designer-ui/docker/org.onap.sdc.p12 b/sdc-workflow-designer-ui/docker/org.onap.sdc.p12 new file mode 100644 index 00000000..d03ca1c9 Binary files /dev/null and b/sdc-workflow-designer-ui/docker/org.onap.sdc.p12 differ diff --git a/sdc-workflow-designer-ui/docker/org.onap.sdc.trust.jks b/sdc-workflow-designer-ui/docker/org.onap.sdc.trust.jks new file mode 100644 index 00000000..d07ce1a6 Binary files /dev/null and b/sdc-workflow-designer-ui/docker/org.onap.sdc.trust.jks differ diff --git a/sdc-workflow-designer-ui/docker/startup.sh b/sdc-workflow-designer-ui/docker/startup.sh new file mode 100644 index 00000000..b2f2d516 --- /dev/null +++ b/sdc-workflow-designer-ui/docker/startup.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +# adding support for https +HTTPS_ENABLED=${IS_HTTPS:-"false"} +CLIENT_AUTH=${IS_CLIENT_AUTH:-"false"} +if [ "$HTTPS_ENABLED" = "true" ] +then + echo "enable ssl" + + java -jar "${JETTY_HOME}/start.jar" --add-to-start=https,ssl \ + jetty.sslContext.keyStorePath=$KEYSTORE_PATH \ + jetty.sslContext.keyStorePassword=$KEYSTORE_PASS \ + jetty.sslContext.keyManagerPassword=$KEYSTORE_PASS \ + jetty.sslContext.trustStorePath=$TRUSTSTORE_PATH \ + jetty.sslContext.trustStorePassword=$TRUSTSTORE_PASS + + echo "setting SSL environment variable" + + SSL_JAVA_OPTS=" -DkeystorePath=$JETTY_BASE/$KEYSTORE_PATH -DkeystorePassword=$KEYSTORE_PASS -DkeyManagerPassword=$KEYSTORE_PASS -DtruststorePath=$JETTY_BASE/$KEYSTORE_PATH -DtruststorePassword=$TRUSTSTORE_PASS -DsslTrustAll=$TRUST_ALL" + + echo $SSL_JAVA_OPTS + +else + echo "no ssl required" +fi +java $JAVA_OPTIONS -DproxyTo=$BACKEND $SSL_JAVA_OPTS -jar $JETTY_HOME/start.jar + -- cgit 1.2.3-korg