diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2017-03-22 11:27:38 +0000 |
|---|---|---|
| committer | Paul Bourke (pbourke) <paul.bourke@oracle.com> | 2017-03-24 11:10:34 +0000 |
| commit | 21c3b2070af0635486f66e0b864533952760738e (patch) | |
| tree | 1546f5e8d2f660d281a57fd14846362d6972008a /docker | |
| parent | ac1d2df3b899d50f62c106620fb9e3e4888046ed (diff) | |
| download | kolla-21c3b2070af0635486f66e0b864533952760738e.tar.gz kolla-21c3b2070af0635486f66e0b864533952760738e.zip | |
Fix source install for vmtp
Install vmtp from source rather than pip for the source install type.
Closes-Bug: #1675733
Co-Authored-By: Mark Duggan <mark.duggan@oracle.com>
Change-Id: I2d024f6d5561306101b0ccec80a34378697d9282
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/vmtp/Dockerfile.j2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2 index 69084d018..9c85f3a8d 100644 --- a/docker/vmtp/Dockerfile.j2 +++ b/docker/vmtp/Dockerfile.j2 @@ -15,10 +15,14 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} {% set vmtp_pip_packages = [ - 'vmtp' + '/vmtp' ] %} -RUN {{ macros.install_pip(vmtp_pip_packages | customizable("pip_packages"), constraints = false) }} +ADD vmtp-archive /vmtp-source +RUN ln -s vmtp-source/* vmtp \ + && {{ macros.install_pip(vmtp_pip_packages | customizable("pip_packages")) }} \ + && mkdir -p /etc/vmtp \ + && chown -R vmtp: /etc/vmtp {% endif %} |