aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-27 16:34:27 +0000
committerGerrit Code Review <review@openstack.org>2015-08-27 16:34:27 +0000
commitee84062af92829f6c4d9069a09714ac8e99f3229 (patch)
treef6131712e33d77dded28f285f741f00df33e28b7
parentfcbee7b27a9d9279c4fc1567ce265892646c6fa2 (diff)
parent13fe758998d0b89a746ff6e8e89825522ee3780d (diff)
downloadkolla-ee84062af92829f6c4d9069a09714ac8e99f3229.tar.gz
kolla-ee84062af92829f6c4d9069a09714ac8e99f3229.zip
Merge "Unify Centos and Ubuntu Source Install - Horizon"
-rw-r--r--docker_templates/horizon/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker_templates/horizon/Dockerfile.j2 b/docker_templates/horizon/Dockerfile.j2
index e02cbe6f6..d05b21c15 100644
--- a/docker_templates/horizon/Dockerfile.j2
+++ b/docker_templates/horizon/Dockerfile.j2
@@ -39,10 +39,10 @@ RUN apt-get install -y --no-install-recommends \
{% endif %}
ADD horizon.tar /
-RUN ln -s /horizon-* /horizon \
+RUN ln -s /horizon-* horizon \
&& pip --no-cache-dir install /horizon \
&& useradd --user-group horizon \
- && mkdir /etc/openstack-dashboard /home/horizon \
+ && mkdir -p /etc/openstack-dashboard /home/horizon \
&& ln -s openstack_dashboard/static/ /usr/lib/python2.7/site-packages/static \
&& ln -s /etc/openstack-dashboard/local_settings /usr/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py \
&& cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \