Merge "Fix dgbuilder image runtime dependencies"

diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile
index c1fd8db..9acb7a5 100644 (file)
--- a/dgbuilder-docker/src/main/docker/Dockerfile
+++ b/dgbuilder-docker/src/main/docker/Dockerfile
@@ -10,7 +10,7 @@ COPY --chown=dgbuilder:dgbuilder opt /opt
 WORKDIR /opt/onap/ccsdk/dgbuilder
 # Set the proxy if needed
 # RUN npm config set proxy http://your.proxy.com:8080
-#RUN npm install
+RUN cd /opt/onap/ccsdk/dgbuilder/ && npm install
 
 #ENTRYPOINT /bin/bash /opt/onap/ccsdk/dgbuilder/start sdnc1.0
 

diff --git a/dgbuilder/start.sh b/dgbuilder/start.sh
index 38f1158..0790a9d 100755 (executable)
--- a/dgbuilder/start.sh
+++ b/dgbuilder/start.sh
@@ -34,8 +34,6 @@ function isRunning {
        echo $(curl -I "$1" 2>/dev/null|head -1|tail -1|awk '{print $2}')
 }
 
-npm install
-
 if [ -e "releases/${releaseDir}/customSettings.js" ]
 then
        pid=$(cat releases/$releaseDir/logs/process_pid 2>/dev/null)