Merge "chown onap:onap to /var/log"

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0b98e5e..8f00db4 100755 (executable)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -36,7 +36,7 @@ WORKDIR /service
 RUN wget -q -O vfc-nfvo-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.lcm&a=vfc-nfvo-lcm&v=LATEST&e=zip' && \
     unzip vfc-nfvo-lcm.zip && \
     rm -rf vfc-nfvo-lcm.zip && \
-    chown onap:onap /service -R
+    chown onap:onap -R /service /var/log
 
 WORKDIR /service/vfc/nfvo/lcm
 RUN pip install --upgrade setuptools pip && \

diff --git a/docker/instance_init.sh b/docker/instance_init.sh
index 1df3f77..db7944c 100755 (executable)
--- a/docker/instance_init.sh
+++ b/docker/instance_init.sh
@@ -31,6 +31,6 @@ GET_NSLCM_DB="show databases like 'vfcnfvolcm';"
 NSLCM_DB=`mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -P$MYSQL_PORT -h$MYSQL_IP -e "GET_NSLCM_DB"`
 if [[ "$NSLCM_DB" == "" ]]; then
     create_database
-
+    migrate_database
 fi
-migrate_database
+