diff options
| author |   Petr Ospalý <p.ospaly@partner.samsung.com> | 2019-06-17 09:33:33 +0200 |
|---|---|---|
| committer | Petr Ospalý <p.ospaly@partner.samsung.com> | 2019-06-17 09:39:08 +0200 |
| commit | 00bb4faa4b14d933a2a81c7344416610288b10c8 (patch) | |
| tree | 71bcce29db0b537999199e44ff6cae1aea957c2d | |
| parent | 428403f72cd97df8bdded8dadb624cd01dde459a (diff) | |
Fix dgbuilder image runtime dependencies
Move npm install into docker build phase, where it should be. Due to the
nature of the upstream project (node-RED) there can be still some
runtime dependencies - it depends on the use-case.
Issue-ID: CCSDK-1117
Signed-off-by: Petr Ospalý <p.ospaly@partner.samsung.com>
Change-Id: I2abda871b880d8323de186dba04f2d1d92ab7622
| -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) |