VTP: Enable VTP in docker as a service

Issue-ID: VNFSDK-304

Change-Id: If57a8bd5917383ec6e7a65346be01165e603a1a7
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@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 270b121..7ee00b3 100644 (file)
--- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
@@ -8,8 +8,8 @@
 
 FROM ubuntu:16.04
 #RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-RUN apt-get install -y 
-RUN apt-get update -y
+RUN apt-get install -y
+RUN apt-get update --fix-missing -y
 RUN apt-get install wget -y
 
 WORKDIR /service
@@ -23,7 +23,7 @@ ENV JAVA_VERSION_MAJOR=8 \
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python-software-properties
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common sudo
 
 RUN add-apt-repository ppa:openjdk-r/ppa -y && \
 
@@ -85,7 +85,7 @@ WORKDIR /service
 RUN  mkdir -p /etc/nginx/ssl
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY certgen.sh /service
-RUN  chmod +x /service/certgen.sh 
+RUN  chmod +x /service/certgen.sh
 RUN  /service/certgen.sh
 
 
@@ -102,12 +102,13 @@ COPY instance-init.sh .
 COPY instance-run.sh .
 COPY instance-workaround.sh .
 COPY docker-entrypoint.sh .
-
+COPY install-vtp.sh .
+COPY vtp-tc.sh .
 
 
 # Set up microservice
 ADD ./STAGE  /service
-RUN apt-get install -y g++ make &&  curl -sL https://rpm.nodesource.com/setup_6.x 
+RUN apt-get install -y g++ make &&  curl -sL https://rpm.nodesource.com/setup_6.x
 RUN apt-get install -y nodejs
 RUN apt-get install -y npm
 RUN apt-get -qq update && apt-get -qq -y install bzip2
@@ -115,6 +116,11 @@ 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
 
+#VTP setup
+RUN chmod a+x /service/install-vtp.sh
+RUN chmod a+x /service/vtp-tc.sh
+RUN /service/install-vtp.sh
+EXPOSE 50051
 
 ENTRYPOINT /service/docker-entrypoint.sh
 RUN chmod a+x /service/docker-entrypoint.sh

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 50327bc..5e3f9bd 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
@@ -15,6 +15,9 @@
 # limitations under the License.
 #
 
+#Start VTP service
+service vtp-tc start
+
 # Start tomcat service
 ./bin/start.sh
 
@@ -28,3 +31,4 @@ done
 echo /service/logs/*
 tail -F /service/logs/*
 
+

diff --git a/vnfmarket-be/deployment/install/docker-compose.yml b/vnfmarket-be/deployment/install/docker-compose.yml
index b9c5542..8d39b76 100644 (file)
--- a/vnfmarket-be/deployment/install/docker-compose.yml
+++ b/vnfmarket-be/deployment/install/docker-compose.yml
@@ -24,6 +24,7 @@ services:
         ports:
             - "8702-8703:8702-8703"
             - "8000:8000"
+            - "50051:50051"
         environment:
             POSTGRES_SERVICE_HOST: postgres
             JPDA_ADDRESS: 8000