From ec7eae5fed5fc0d76f6fb34e2419deba4e2604e9 Mon Sep 17 00:00:00 2001 From: Proskurin Kirill Date: Thu, 10 Nov 2016 14:14:51 +0000 Subject: [PATCH] Use copy_source for requirements repo fetching Right now we use upper-constrains from master, which is very very wrong. Change-Id: Iaec316307c3308c6684bcad15447e4379b51687c --- docker/openstack-base/Dockerfile.j2 | 9 +++++---- service/files/defaults.yaml | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 service/files/defaults.yaml diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 9393314..e1e8cfe 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -15,10 +15,11 @@ RUN apt-get install -y --no-install-recommends \ COPY pip.conf /tmp/pip.conf -RUN curl -o /tmp/constraints.txt https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt \ - && pip --no-cache-dir install -U virtualenv \ +{{ copy_sources("openstack/requirements", "/tmp/requirements") }} + +RUN pip --no-cache-dir install -U virtualenv \ && virtualenv /var/lib/microservices/venv \ - && mv /tmp/constraints.txt /var/lib/microservices/venv \ + && mv /tmp/requirements/upper-constraints.txt /var/lib/microservices/venv/constraints.txt \ && mv /tmp/pip.conf /var/lib/microservices/venv \ && /var/lib/microservices/venv/bin/pip install --upgrade \ Babel \ @@ -121,6 +122,6 @@ RUN curl -o /tmp/constraints.txt https://git.openstack.org/cgit/openstack/requir unicodecsv \ warlock \ wrapt \ - && rm -rf requirements + && rm -rf /tmp/requirements ENV PATH /var/lib/microservices/venv/bin:$PATH diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml new file mode 100644 index 0000000..d71cf60 --- /dev/null +++ b/service/files/defaults.yaml @@ -0,0 +1,4 @@ +sources: + openstack/requirements: + git_url: https://git.openstack.org/openstack/requirements.git + git_ref: stable/newton