From: Petr Ospalý <p.ospaly@partner.samsung.com>
Date: Fri, 7 Jun 2019 16:30:36 +0000 (+0200)
Subject: Fix admportal image
X-Git-Tag: 1.6.1~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=92bc2f4964e1930c00bcb0ff2e23013b06de9327

Fix admportal image

Docker container should be stateless and be self-contained. When image
is run as container it should behave exactly the same with each run.

This commit moves npm install stuff into docker build stage where
it belongs.

Please, read:
https://docs.docker.com/get-started/part2/

Issue-ID: SDNC-685
Signed-off-by: Petr Ospalý <p.ospaly@partner.samsung.com>
Change-Id: I4ff18b313a9af400bbfc2cbf6f4a1b1334593d9a

Former-commit-id: 8436b953a938452f2d7c865e3bc2449ecfcabdea
---

diff --git a/admportal/shell/start_portal.sh b/admportal/shell/start_portal.sh
index 8a0c4452..36716f47 100755
--- a/admportal/shell/start_portal.sh
+++ b/admportal/shell/start_portal.sh
@@ -20,11 +20,12 @@ SSL_ENABLED=`python $PROJECT_HOME/admportal/shell/getAdmPortalProp.py sslEnabled
 export SSL_ENABLED
 
 if [ ! -d /opt/onap/sdnc/admportal/node_modules ]; then
-	cd /opt/onap/sdnc/admportal && npm install
+    echo "ERROR: missing node modules: /opt/onap/sdnc/admportal/node_modules"
+    exit 1
 fi
 
 cd /opt/onap/sdnc/admportal
-node shell/www
+exec node shell/www
 #if [ "true" == "${SSL_ENABLED}" ]; then
 	#pm2 startOrRestart process.https.json
 #else
diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile
index 21cd7a30..f5b51d1f 100644
--- a/installation/admportal/src/main/docker/Dockerfile
+++ b/installation/admportal/src/main/docker/Dockerfile
@@ -8,5 +8,7 @@ MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
 # copy openecomp
 COPY opt /opt
 
+RUN cd /opt/onap/sdnc/admportal && npm install
+
 #ENTRYPOINT exec /opt/openecomp/sdnc/admportal/shell/startssl.sh
 EXPOSE 8843 8443