Migrate container to ubuntu 16.04

Change-Id: I283ad904a9618fdcb7e442869fbaccc5d6ec9e16
Issue-ID: VNFSDK-211
Signed-off-by: Avinash S <avinash.s@huawei.com>

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 12b354b..556bea4 100644 (file)
--- 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 e2b0544..50327bc 100755 (executable)
--- 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