diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-15 14:58:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-15 14:58:07 +0000 |
| commit | 2f1cc59b56ec99c7fa21160823b4d6eb1b14d1ed (patch) | |
| tree | 48dc5ec1fe2c37b5068f31851a6764ff467abcae | |
| parent | 3baa57ddb701fd79bdc21964009abc0b7f7a07e6 (diff) | |
| parent | 72a8f5aabd31079d6fe8f0442a487689b4ba7bde (diff) | |
| download | kolla-2f1cc59b56ec99c7fa21160823b4d6eb1b14d1ed.tar.gz kolla-2f1cc59b56ec99c7fa21160823b4d6eb1b14d1ed.zip | |
Merge "Use openstack/requirements for repeatable builds"
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | etc/kolla/kolla-build.conf | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 345a1b604..fda017c0c 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -73,10 +73,12 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ +ADD openstack-base-archive /openstack-base-source +RUN ln -s openstack-base-source/* /requirements \ + && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ && rm get-pip.py \ - && pip --no-cache-dir install -U \ + && pip --no-cache-dir install -U -c requirements/upper-constraints.txt \ python-barbicanclient \ python-ceilometerclient \ python-congressclient \ diff --git a/etc/kolla/kolla-build.conf b/etc/kolla/kolla-build.conf index c4281248f..45940fd2e 100644 --- a/etc/kolla/kolla-build.conf +++ b/etc/kolla/kolla-build.conf @@ -56,6 +56,11 @@ # reference: stable # git reference to pull, commit sha, tag or branch name # # pulls from master branch unless specified otherwise +[openstack-base] +type = git +location = https://github.com/openstack/requirements.git +reference = master + [ceilometer-base] type = url location = http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz |