diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2018-08-29 02:07:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-29 02:07:51 +0000 |
| commit | 86b9b2780ce661a56bd3f25312eedceab3aa39e0 (patch) | |
| tree | f6ebf97404b88689a91543a36feee9c6111638ba /docker | |
| parent | 297bfc5f20f5b0077968870c2270dcf1b8114724 (diff) | |
| parent | c9ebe8076e2fc0655ae1afe45e15c36b20cabd8e (diff) | |
Merge "Bugfix: openstack router list broken in Yardstick container - dovetail" into stable/fraser
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 240e7a629..4a4189f8c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,7 +26,7 @@ ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick/" \ RUN apt-get update && apt-get install -y git python-setuptools python-pip iputils-ping && apt-get -y autoremove && apt-get clean RUN easy_install -U setuptools==30.0.0 -RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 python-heatclient==1.11.0 ansible==2.4.2 +RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 openstacksdk==0.9.17 python-openstackclient==3.12.1 python-heatclient==1.11.1 ansible==2.5.5 RUN mkdir -p ${REPOS_DIR} diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch index 8816fad80..5b9cf0ddf 100644 --- a/docker/Dockerfile.aarch64.patch +++ b/docker/Dockerfile.aarch64.patch @@ -38,7 +38,7 @@ index 62ea0d0..f2f41771 100644 +RUN apt-get update && apt-get install -y git python-setuptools python-pip iputils-ping && apt-get -y autoremove && \ + apt-get install -y libssl-dev && apt-get -y install libffi-dev && apt-get clean RUN easy_install -U setuptools==30.0.0 - RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 python-heatclient==1.11.0 ansible==2.4.2 + RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 openstacksdk==0.9.17 python-openstackclient==3.12.1 python-heatclient==1.11.1 ansible==2.5.5 @@ -48,8 +49,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf # nginx=5000, rabbitmq=5672 |