diff options
| -rwxr-xr-x | docker/Dockerfile | 6 | ||||
| -rwxr-xr-x | docker/instance_init.sh | 6 |
2 files changed, 4 insertions, 8 deletions
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 |