diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-07 11:50:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-07 11:50:19 +0000 |
| commit | d52f5aea68da2d7e31c31c807d15add32629398e (patch) | |
| tree | a68ff6f00d02f995684234cbf7fa0e5bf70eba85 /docker/nova/nova-spicehtml5proxy | |
| parent | 711dd714b356cb05262133821ef0a9d1e7ae8550 (diff) | |
| parent | 91d3c57fd148f96fca626d6850d670e5c5a2bc04 (diff) | |
| download | kolla-d52f5aea68da2d7e31c31c807d15add32629398e.tar.gz kolla-d52f5aea68da2d7e31c31c807d15add32629398e.zip | |
Merge "Nova ubuntu binary container"
Diffstat (limited to 'docker/nova/nova-spicehtml5proxy')
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 046277662..e0d194795 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum -y install openstack-nova-spicehtml5proxy \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + nova-spiceproxy \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} |
