From f1a805a63cf508e217bca002c36d61a1ae629d7e Mon Sep 17 00:00:00 2001 From: fujinhua Date: Tue, 5 Sep 2017 15:29:09 +0800 Subject: Move pip install to Dockerfile Change-Id: I47f6ac1381fb64628ffee7c7b7c23abbc79c1168 Issue-Id: VFC-278 Signed-off-by: fujinhua --- docker/Dockerfile | 6 ++++-- docker/instance_init.sh | 6 ------ 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 4093c80d..e8d03b38 100755 --- a/docker/Dockerfile +++ b/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,9 @@ RUN wget -q -O vfc-nfvo-lcm.zip 'https://nexus.onap.org/service/local/artifact/m unzip vfc-nfvo-lcm.zip && \ rm -rf vfc-nfvo-lcm.zip +WORKDIR /service/vfc/nfvo/lcm +RUN pip install -r requirements.txt + EXPOSE 8403 EXPOSE 3306 EXPOSE 6379 diff --git a/docker/instance_init.sh b/docker/instance_init.sh index f5a50547..3c0dcce1 100755 --- a/docker/instance_init.sh +++ b/docker/instance_init.sh @@ -1,10 +1,5 @@ #!/bin/bash -function install_python_libs { - cd /service/vfc/nfvo/lcm/ - pip install -r requirements.txt -} - function start_redis_server { redis-server & } @@ -21,7 +16,6 @@ function create_database { cd /service } -install_python_libs start_redis_server start_mysql create_database -- cgit 1.2.3-korg