diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2016-04-14 11:21:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-14 11:21:36 +0000 |
| commit | 378094d7ad21a21bcb5067053db2e904ae792f18 (patch) | |
| tree | 2ff8345dabe95b328b33bfdc0051ce99e49e61b4 | |
| parent | 77a0a075062b7f7ea3053eb93baf96d3edbd4ef5 (diff) | |
| parent | e1b4821d75cf0e9876731653570dc1efb5dc49fb (diff) | |
Merge "rewrite Dockerfile"
| -rw-r--r-- | ci/docker/Dockerfile | 8 | ||||
| -rw-r--r-- | requirements.txt | 83 |
2 files changed, 86 insertions, 5 deletions
diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile index 706718c2..68962115 100644 --- a/ci/docker/Dockerfile +++ b/ci/docker/Dockerfile @@ -21,13 +21,19 @@ ENV RELENG_REPO_DIR ${REPOS_DIR}/releng #new test suite required packages can be added here RUN apt-get update && apt-get install -y \ + libffi-dev \ + libssl-dev \ + libxml2-dev \ + libxslt1-dev \ curl \ wget \ git \ sshpass \ python \ python-dev \ - python-pip + python-pip \ + python-setuptools && \ + easy_install -U setuptools RUN apt-get -y autoremove && \ apt-get clean diff --git a/requirements.txt b/requirements.txt index 0fe0608f..e07a0c65 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,79 @@ -python-glanceclient>=2.0.0 # Apache-2.0 -python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0 -python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 -python-heatclient>=0.6.0 # Apache-2.0 +############################################################################## +# Copyright (c) 2016 Huawei Tech. and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +appdirs==1.4.0 +Babel==2.2.0 +backport-ipaddress==0.1 +cliff==2.0.0 +cmd2==0.6.8 +coverage==4.1b2 +debtcollector==1.3.0 +ecdsa==0.13 +extras==0.0.3 +fixtures==1.4.0 +flake8==2.5.4 +funcsigs==0.4 +functools32==3.2.3.post2 +futures==3.0.5 +iso8601==0.1.11 +Jinja2==2.8 +jsonpatch==1.13 +jsonpointer==1.10 +jsonschema==2.5.1 +keystoneauth1==2.3.0 +linecache2==1.0.0 +lxml==3.5.0 +MarkupSafe==0.23 +mccabe==0.4.0 +mock==1.3.0 +monotonic==1.0 +msgpack-python==0.4.7 +netaddr==0.7.18 +netifaces==0.10.4 +nose==1.3.7 +openstacksdk==0.8.1 +os-client-config==1.16.0 +oslo.config==3.9.0 +oslo.i18n==3.4.0 +oslo.serialization==2.4.0 +oslo.utils==3.7.0 +paramiko==1.16.0 +pbr==1.8.1 +pep8==1.7.0 +positional==1.0.1 +prettytable==0.7.2 +pycrypto==2.6.1 +pyflakes==1.0.0 +pyparsing==2.1.0 +pyrsistent==0.11.12 +python-cinderclient==1.6.0 +python-glanceclient==2.0.0 +python-heatclient==1.0.0 +python-keystoneclient==2.3.1 +python-mimeparse==1.5.1 +python-neutronclient==4.1.1 +python-novaclient==3.3.0 +python-openstackclient==2.2.0 +python-subunit==1.2.0 +python-swiftclient==3.0.0 +pytz==2015.7 +PyYAML==3.11 +requests==2.9.1 +requestsexceptions==1.1.3 +scp==0.10.2 +simplejson==3.8.2 +six==1.10.0 +stevedore==1.12.0 +testrepository==0.0.20 +testtools==2.0.0 +traceback2==1.4.0 +unicodecsv==0.14.1 +unittest2==1.1.0 +warlock==1.2.0 +wrapt==1.10.6 |