nova-novncproxy cannot build from git clone

[Vladislav Belogrudov]

Current build procedure clones from remote git repository into folder named as image and creates archive with the same name. But for nova-novncproxy and its archive nova-novncproxy.tar we expect kanaka-noVNC-XXXX as extracted folder. It is suggested to name the folder for clone as basename of repository.

[Vladislav Belogrudov (vlad-belogrudov)]

we have a few use cases

openstack tarballs:

  http://tarballs.openstack.org/swift/swift-master.tar.gz -> swift-base.tar -> /swift-XXXX

  http://github.com/kanaka/noVNC/tarball/v0.5.1 -> nova-novncproxy.tar -> /kanaka-noVNC-XXXX

Git clone:

 http://my.git.org/swift -> swift-base.tar -> /swift-XXXX

this fails for noVNC. We cannot assume any naming convention for added tars, so may be just dropping content of tarball to a known location inside Docker and linking to it?

ADD nova-novncproxy.tar /nova-novncproxy
RUN ln -s /nova-novncproxy/* /usr/share/novnc

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/219723

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/219723
Committed: https://git.openstack.org/cgit/stackforge/kolla/commit/?id=c22cf33268979db15f06f2bab347750127e5d7ee
Submitter: Jenkins
Branch: master

commit c22cf33268979db15f06f2bab347750127e5d7ee
Author: Vladislav Belogrudov <email address hidden>
Date: Wed Sep 2 17:36:46 2015 +0300

    Allow arbitrary source archive name to be imported into Dockerfile

    Currently we cannot import source archives with names different
    than expected by hardcoded line in Dockerfiles. This worked well
    for Openstack services' tarballs where we expected SERVICE-* root
    folder after extraction or kanaka-noVNC for nova-novncproxy docker.
    The latter fails if one tries to clone or get tarball under other
    names. This fix allows any archive (tar,tgz,zip) or repo name to be
    imported into dockerfile.

    Change-Id: I869a6a19afaf0e93925572746c22b7589b6600c9
    Closes-Bug: #1491415