From 45f625a73ea67b31460fdb9da74ba8d619383783 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Mon, 31 Aug 2015 04:09:59 +0000 Subject: Remove dest_filename from build.ini We can, and should, figure out the filename dynamically rather than hardcode that value in build.ini since it is not actually a configurable paramater. Change-Id: I496d6555e9fa356ab09e62063fd707f43ed08121 Closes-Bug: #1490386 --- docker/nova/nova-base/Dockerfile.j2 | 2 +- docker/nova/nova-novncproxy/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index b46a446d4..ad43bb9c4 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -39,7 +39,7 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -ADD nova.tar / +ADD nova-base.tar / RUN ln -s /nova-* nova \ && useradd --user-group nova \ && pip --no-cache-dir install /nova \ diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index b798e00a6..f7d25338e 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -20,7 +20,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu', 'debian'] %} -ADD novnc.tar / +ADD nova-novncproxy.tar / RUN ln -s /kanaka-noVNC-* /usr/share/novnc {% endif %} -- cgit v1.2.3