diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-06-18 15:04:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-18 15:04:41 +0000 |
| commit | b8ea4fbbf2c504a660843007e362098b25fd3b5a (patch) | |
| tree | f05c23de72b57c93e86ba830bd1706e489eaf11a | |
| parent | 588605e48cf6bfdc2db8730931f477eba2c74550 (diff) | |
| parent | 00bb4faa4b14d933a2a81c7344416610288b10c8 (diff) | |
Merge "Fix dgbuilder image runtime dependencies"
| -rw-r--r-- | dgbuilder-docker/src/main/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | dgbuilder/start.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile index c1fd8dbd..9acb7a5c 100644 --- 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 38f11582..0790a9d2 100755 --- 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) |