Fix docker file of vfc-gvnfm-vnflcm

ci env problem, retry

Change-Id: I85f17c7a64fd06ac5052d9a02ba9173a49778fd5
Issue-Id: VFC-288
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/docker/Dockerfile b/lcm/docker/Dockerfile
index 7b23698..ce616b5 100755 (executable)
--- a/lcm/docker/Dockerfile
+++ b/lcm/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
@@ -42,6 +41,11 @@ RUN wget -q -O vfc-gvnfm-vnfres-res.zip 'https://nexus.onap.org/service/local/ar
     mv ./vfc/gvnfm/vnfres/res/assembly/dbscripts ./dbscripts && \
     rm -rf vfc-gvnfm-vnfres-res.zip
 
+RUN sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf
+
+WORKDIR /service/vfc/gvnfm/vnflcm/lcm
+RUN pip install -r requirements.txt
+
 EXPOSE 8801
 EXPOSE 3306
 EXPOSE 6379

diff --git a/lcm/docker/build_image.sh b/lcm/docker/build_image.sh
index 52ed777..443142a 100755 (executable)
--- a/lcm/docker/build_image.sh
+++ b/lcm/docker/build_image.sh
@@ -19,15 +19,14 @@ if [ $HTTPS_PROXY ]; then
     BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
 fi
 
-function build_vnflcm {
+function build_image {
     docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
 }
 
-function push_vnflcm {
+function push_image {
     docker push ${IMAGE_NAME}:${VERSION}
     docker push ${IMAGE_NAME}:latest
 }
 
-build_vnflcm
-push_vnflcm
-
+build_image
+push_image

diff --git a/lcm/docker/docker-entrypoint.sh b/lcm/docker/docker-entrypoint.sh
index 2c6a8c0..aa475fe 100755 (executable)
--- a/lcm/docker/docker-entrypoint.sh
+++ b/lcm/docker/docker-entrypoint.sh
@@ -18,7 +18,7 @@ echo "MSB_ADDR=$MSB_ADDR"
 
 # Wait for MSB initialization
 echo "Wait for MSB initialization"
-for i in {1..20}; do
+for i in {1..5}; do
     curl -sS -m 1 $MSB_ADDR > /dev/null && break
     sleep $i
 done

diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index d727efe..90468f8 100755 (executable)
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -1,21 +1,12 @@
 #!/bin/bash
-function install_python_libs {
-    cd /service/vfc/gvnfm/vnflcm/lcm
-    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 {
@@ -24,7 +15,6 @@ function create_database {
     cd /service
 }
 
-install_python_libs
 start_redis_server
 start_mysql
 create_database