diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-04 06:24:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-04 06:24:28 +0000 |
| commit | 91bc4b094c79f75b8c9eb54769571f4f4c03cc11 (patch) | |
| tree | 39101fd0fb16fc07f9ae31a919eddec749aa78e7 /docker/nova | |
| parent | d799f819d4e32fa19abbecb403cbb14a0631a1c1 (diff) | |
| parent | c22cf33268979db15f06f2bab347750127e5d7ee (diff) | |
| download | kolla-91bc4b094c79f75b8c9eb54769571f4f4c03cc11.tar.gz kolla-91bc4b094c79f75b8c9eb54769571f4f4c03cc11.zip | |
Merge "Allow arbitrary source archive name to be imported into Dockerfile"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-novncproxy/Dockerfile.j2 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 0010cbaed..f6ec8c3e1 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -39,8 +39,8 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -ADD nova-base.tar / -RUN ln -s /nova-* nova \ +ADD nova-base-archive /nova-base-source +RUN ln -s nova-base-source/* nova \ && useradd --user-group nova \ && pip --no-cache-dir install /nova \ && mkdir -p /etc/nova /var/log/nova /home/nova \ diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index a2fcf98cc..1a90e4f01 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.tar / -RUN ln -s /kanaka-noVNC-* /usr/share/novnc +ADD nova-novncproxy-archive /nova-novncproxy-source +RUN ln -s nova-novncproxy-source/* /usr/share/novnc {% endif %} |