diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-20 18:22:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-20 18:22:41 +0000 |
| commit | 213a585ee62fa0d349775303419775bc02eb34d9 (patch) | |
| tree | 71f70b10d28ea378cee5bed65ef447c1e5a35f18 /docker/heat | |
| parent | b39a80db9caea1f65bf1b69ebc68d7188410df66 (diff) | |
| parent | 961224c6cf5ac24fc49fc52ab3c51a87348ee35d (diff) | |
| download | kolla-213a585ee62fa0d349775303419775bc02eb34d9.tar.gz kolla-213a585ee62fa0d349775303419775bc02eb34d9.zip | |
Merge "Use install-pip macro in most source images"
Diffstat (limited to 'docker/heat')
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 6a0a73f36..b22290e38 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -19,8 +19,13 @@ MAINTAINER {{ maintainer }} {% elif install_type == 'source' %} ADD heat-base-archive /heat-base-source + +{% set heat_base_pip_packages = [ + '/heat' +] %} + RUN ln -s heat-base-source/* heat \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /heat \ + && {{ macros.install_pip(heat_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/heat \ && cp -r /heat/etc/heat/* /etc/heat/ \ && chown -R heat: /etc/heat |