diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-21 10:01:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-21 10:01:15 +0000 |
| commit | ef862427fa3dae10e80393f520cf24a11c336ec3 (patch) | |
| tree | 9a6a90fd5f046df148adfe94ac568a2cc991cc33 /docker | |
| parent | 7e4f78130b4a3492ce6a67d809ba3020737f900d (diff) | |
| parent | a7d4431928982a21740fd1459e08dede7178f1ab (diff) | |
| download | kolla-ef862427fa3dae10e80393f520cf24a11c336ec3.tar.gz kolla-ef862427fa3dae10e80393f520cf24a11c336ec3.zip | |
Merge "Add nova-spicehtml5proxy console"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 new file mode 100644 index 000000000..2397e68d0 --- /dev/null +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -0,0 +1,18 @@ +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN echo 'ERROR: The specified distro has no Kolla images to build: "{{ base_distro }}"' \ + && /bin/false + + {% endif %} +{% elif install_type == 'source' %} + +ADD nova-spicehtml5proxy-archive /usr/share/nova-spicehtml5proxy-source +RUN cd /usr/share && ln -s nova-spicehtml5proxy-source/* spice-html5 + +{% endif %} + +{{ include_footer }} |