diff options
| author |   Murali Mohan Murthy Potham <murali.p@huawei.com> | 2018-03-08 06:12:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-08 06:12:35 +0000 |
| commit | d0d3309a0725ee2167b24d4f8a9d500279cf624a (patch) | |
| tree | ab8196d287ad81a25a65523613a4e462337ca46f /vnfmarket-be | |
| parent | 98ece51f52f93deed375c5215bd6513e281aa8ed (diff) | |
| parent | fa530d99c85ad22273b09647a0a0e8a3aa4dbe6a (diff) | |
Merge "Migrate container to ubuntu 16.04"
Diffstat (limited to 'vnfmarket-be')
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile | 13 | ||||
| -rwxr-xr-x | vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile index 12b354bc..556bea48 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile @@ -84,9 +84,9 @@ WORKDIR /service RUN mkdir -p /etc/nginx/ssl COPY nginx.conf /etc/nginx/nginx.conf -COPY certgen.sh . -CMD chmod +x ./certgen.sh -RUN ./certgen.sh +COPY certgen.sh /service +RUN chmod +x /service/certgen.sh +RUN /service/certgen.sh @@ -111,12 +111,15 @@ RUN apt-get install -y g++ make && curl -sL https://rpm.nodesource.com/setup_6. RUN apt-get install -y nodejs RUN apt-get install -y npm RUN apt-get -qq update && apt-get -qq -y install bzip2 -RUN cd /service/webapps/onapui/vnfmarket && npm install phantomjs-prebuilt@2.1.14 --ignore-scripts && npm install -CMD chmod +x ./bin/*.sh && service nginx start +RUN chmod +x /service/bin/*.sh +RUN service nginx start & +RUN cd /service/webapps/onapui/vnfmarket && npm install phantomjs-prebuilt@2.1.14 --ignore-scripts && npm install ENTRYPOINT /service/docker-entrypoint.sh RUN chmod a+x /service/docker-entrypoint.sh ENTRYPOINT ["/service/docker-entrypoint.sh"] + + COPY LICENSE ./ONAP_LICENSE diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh index e2b0544b..50327bc2 100755 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh @@ -18,6 +18,8 @@ # Start tomcat service ./bin/start.sh + +service nginx start # Show log files echo Waiting for log file... while [ ! -f /service/logs/* ]; do |