From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Wed, 6 Sep 2017 05:05:18 +0000 (+0800)
Subject: Update gvnfm vnfres dockerfile
X-Git-Tag: v1.0.0~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F10481%2F2;p=vfc%2Fgvnfm%2Fvnfres.git

Update gvnfm vnfres dockerfile

Move python requirements install to dockerfile.

Change-Id: I81137109bc263a4a875968ebc01cf3c5ff3e0bfa
Issue-ID: VFC-292
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

diff --git a/res/docker/Dockerfile b/res/docker/Dockerfile
index 8c7f8e6..e9b6a45 100644
--- a/res/docker/Dockerfile
+++ b/res/docker/Dockerfile
@@ -24,8 +24,7 @@ RUN apt-get update && \
     apt-get install -y curl && \
     apt-get install -y build-essential && \
     apt-get install -y libssl-dev && \
-    apt-get install -y libffi-dev && \
-    yes | pip install cryptography
+    apt-get install -y libffi-dev
 
 ADD . /service
 WORKDIR /service
@@ -35,6 +34,11 @@ RUN wget -q -O vfc-gvnfm-vnfres.zip 'https://nexus.onap.org/service/local/artifa
     unzip vfc-gvnfm-vnfres.zip && \
     rm -rf vfc-gvnfm-vnfres.zip
 
+RUN sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf
+
+WORKDIR /service/vfc/gvnfm/vnfres/res
+RUN pip install -r requirements.txt
+
 EXPOSE 8802
 EXPOSE 3306
 EXPOSE 6379
diff --git a/res/docker/instance_init.sh b/res/docker/instance_init.sh
index fd7c60f..1986369 100644
--- a/res/docker/instance_init.sh
+++ b/res/docker/instance_init.sh
@@ -1,22 +1,12 @@
 #!/bin/bash
 
-function install_python_libs {
-    cd /service/vfc/gvnfm/vnfres/res/
-    pip install -r requirements.txt
-}
-
 function start_redis_server {
     redis-server &
 }
 
 function start_mysql {
-    su mysql -c /usr/bin/mysqld_safe &
     service mysql start
-    # Wait for mysql to initialize; Set mysql root password
-    for i in {1..10}; do
-        sleep $i
-        bash /usr/bin/mysqladmin -u root password $MYSQL_ROOT_PASSWORD &> /dev/null && break
-    done
+    sleep 1
 }
 
 function create_database {
@@ -25,7 +15,6 @@ function create_database {
     cd /service
 }
 
-install_python_libs
 start_redis_server
 start_mysql
 create_database