diff options
| author | Mathieu Mitchell <mmitchell@iweb.com> | 2016-08-22 15:43:39 -0400 |
|---|---|---|
| committer | Mathieu Mitchell <mmitchell@iweb.com> | 2016-08-30 07:22:29 -0400 |
| commit | 855edf67d02a313ab2823c2df5436937db51bd76 (patch) | |
| tree | 126492902874a326b403a18ece766dfb083924e2 /Dockerfile | |
| parent | a04f8cb1c4d694d005f0df56090cdf3971258c8d (diff) | |
| download | ironic-python-agent-stable/liberty.tar.gz | |
Enforce upper-constraints when building ramdisksliberty-eol1.0.5stable/liberty
Currently, building ramdisks installs ironic-python-agent without any
upper-constraints. This causes the package to be installed with newer,
untested dependencies.
This commits introduces a tool to generate a local upper-constraints
file based on predefined strategies (below). Additionally, the fallback
to the openstack/requirements uses the URL defined in tox.ini instead of
redefining it. This prevents having to keep track of two separate
variables when releasing.
upper-constraints lookup strategies (in order):
* UPPER_CONSTRAINTS_FILE points to a local file
* UPPER_CONSTRAINTS_FILE points to a URL
* /opt/stack/new/requirements/upper-constraints.txt
* upper-constraints.txt from openstack/requirements git repository
Partial-bug: #1616554
Change-Id: Ib5c0c57cafdb6ffd7456e61f3b1bb5fa57520e5a
(cherry picked from commit a0ca6ce157b8a84f282d8abbdd27c75f48d991ff)
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -28,11 +28,10 @@ RUN apt-mark manual python-minimal # Install requirements separately, because pip understands a git+https url # while setuptools doesn't RUN pip install --upgrade pip -# TODO(jroll) use upper-constraints here -RUN pip install -r /tmp/ironic-python-agent/requirements.txt +RUN pip install -c /tmp/ironic-python-agent/upper-constraints.txt -r /tmp/ironic-python-agent/requirements.txt # This will succeed because all the dependencies were installed previously -RUN pip install /tmp/ironic-python-agent +RUN pip install -c /tmp/ironic-python-agent/upper-constraints.txt /tmp/ironic-python-agent # Remove no longer needed packages RUN apt-get -y purge gcc-4.6 gcc python2.7-dev git && \ |
