aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-04 06:24:28 +0000
committerGerrit Code Review <review@openstack.org>2015-09-04 06:24:28 +0000
commit91bc4b094c79f75b8c9eb54769571f4f4c03cc11 (patch)
tree39101fd0fb16fc07f9ae31a919eddec749aa78e7 /docker/nova/nova-base
parentd799f819d4e32fa19abbecb403cbb14a0631a1c1 (diff)
parentc22cf33268979db15f06f2bab347750127e5d7ee (diff)
downloadkolla-91bc4b094c79f75b8c9eb54769571f4f4c03cc11.tar.gz
kolla-91bc4b094c79f75b8c9eb54769571f4f4c03cc11.zip
Merge "Allow arbitrary source archive name to be imported into Dockerfile"
Diffstat (limited to 'docker/nova/nova-base')
-rw-r--r--docker/nova/nova-base/Dockerfile.j24
1 files changed, 2 insertions, 2 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 \