openstack/kolla
Code Issues Proposed changes

Use absolute path in install_pip macro

Browse Source 
This lets us use the macro in the case there was a WORKDIR instruction
that changed the working directory from / earlier in the dockerfile.

Change-Id: I2369c9997ef189e7084fac7b5ace014f6f76d698
Closes-Bug: #1746682
This commit is contained in:
Martin André
2018-02-01 09:26:44 +01:00
parent 8f0583347c
commit 0d4760eaac
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/macros.j2
View File

@@ -24,7 +24,7 @@
{% macro install_pip(packages, constraints = true) %} {% macro install_pip(packages, constraints = true) %}
{%- if packages is sequence and packages|length > 0 -%} {%- if packages is sequence and packages|length > 0 -%}
pip --no-cache-dir install --upgrade{{ ' ' }} pip --no-cache-dir install --upgrade{{ ' ' }}
{%- if constraints %}-c requirements/upper-constraints.txt {% endif -%} {%- if constraints %}-c /requirements/upper-constraints.txt {% endif -%}
{{ packages | join(' ') }} {{ packages | join(' ') }}
{%- else -%} {%- else -%}
true true