diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-13 20:13:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-13 20:13:25 +0000 |
| commit | 9633c60c58c9fe0fa59e2f8558437ea6eabd9d15 (patch) | |
| tree | 35797ceb0f172466a39d658a496c5def3d446324 /docker | |
| parent | 31594eef5ba55d6151b87dc1204909f4d8413eaf (diff) | |
| parent | 8080ba0e404f9f4efb78ece6c6c86480f68cb44f (diff) | |
| download | kolla-9633c60c58c9fe0fa59e2f8558437ea6eabd9d15.tar.gz kolla-9633c60c58c9fe0fa59e2f8558437ea6eabd9d15.zip | |
Merge "Make novncproxy work on from source installs"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-novncproxy/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index c203d45d2..cc31515c1 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -12,8 +12,8 @@ RUN yum -y install \ {% endif %} {% elif install_type == 'source' %} -ADD nova-novncproxy-archive /nova-novncproxy-source -RUN ln -s nova-novncproxy-source/* /usr/share/novnc +ADD nova-novncproxy-archive /usr/share/nova-novncproxy-source +RUN cd /usr/share && ln -s nova-novncproxy-source/* novnc {% endif %} |