aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-05-15 13:27:58 -0700
committerPatrick Brady <patrick.brady@att.com>2019-05-15 22:11:46 +0000
commit4b1967d84f96960a1a0013035fab2aa7fd6cf377 (patch)
treec501f59555bf4f0ab6f7c2ae724ff499eca2c993
parentb2e631247a19c3b3825e2eec336ad17669d42215 (diff)
Update cdt for nodejs backend
Change cdt container to use a nodejs container so that the nodejs backend of cdt can run. Change-Id: I280bc02bee136bb1eda908f91e7efacfca8eb101 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1600 (cherry picked from commit 57eafffb6fcbcac82b021e8adcd80fcec58d8ae2)
-rw-r--r--cdt/src/main/docker/Dockerfile5
-rw-r--r--cdt/src/main/scripts/startCdt.sh10
2 files changed, 11 insertions, 4 deletions
diff --git a/cdt/src/main/docker/Dockerfile b/cdt/src/main/docker/Dockerfile
index 514ddba..26efda4 100644
--- a/cdt/src/main/docker/Dockerfile
+++ b/cdt/src/main/docker/Dockerfile
@@ -20,10 +20,11 @@
# ============LICENSE_END============================================
# Base Alpine with added packages needed for ONAP
-FROM nginx:1.15.9-alpine
+FROM node:10.15.3-alpine
MAINTAINER APP-C Team (appc@lists.openecomp.org)
COPY config-design-tool /opt/cdt
COPY startCdt.sh /opt/startCdt.sh
COPY cert /opt/cert
-COPY nginx.conf /etc/nginx/nginx.conf
+RUN mkdir /opt/cdt/logs
+RUN npm install express --save
diff --git a/cdt/src/main/scripts/startCdt.sh b/cdt/src/main/scripts/startCdt.sh
index d371799..aa4c82e 100644
--- a/cdt/src/main/scripts/startCdt.sh
+++ b/cdt/src/main/scripts/startCdt.sh
@@ -4,7 +4,7 @@
# ============LICENSE_START=======================================================
# APPC
# ================================================================================
-# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -24,4 +24,10 @@ CDT_PORT=${CDT_PORT:-30232}
echo "Setting CDT port to $CDT_PORT"
sed -i -e "s/30290/$CDT_PORT/" /opt/cdt/main.bundle.js
-exec /usr/sbin/nginx -g 'daemon off;'
+CDT_HOME=/opt/cdt; export CDT_HOME
+LOG_DIR=/opt/cdt/logs; export LOG_DIR
+MaxLogSize=3000000; export MaxLogSize
+PORT=18080; export PORT
+HTTPS_KEY_FILE=/opt/cert/cdt-key.pem; export HTTPS_KEY_FILE
+HTTPS_CERT_FILE=/opt/cert/cdt-cert.pem; export HTTPS_CERT_FILE
+node $CDT_HOME/app/ndserver.js 2>&1 >/dev/null