diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-11 21:33:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-11 21:33:54 +0000 |
| commit | 265de22e63d1215cf75340636c92e143afe82bff (patch) | |
| tree | f530b41545a91dcc7bcc2ea0f09f78041c6a9bc1 /docker | |
| parent | 335c739a0a61ec31555b463fd62731edb29e41de (diff) | |
| parent | 9f604456be6efa7bda3973bf3fdb9019ec350297 (diff) | |
| download | kolla-265de22e63d1215cf75340636c92e143afe82bff.tar.gz kolla-265de22e63d1215cf75340636c92e143afe82bff.zip | |
Merge "Fix owner of horizon docroot"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index f9e5a7fab..55d258cd4 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -9,12 +9,12 @@ RUN yum -y install \ httpd \ mod_wsgi \ && yum clean all \ - && chown -R apache: /usr/share/openstack-dashboard/static \ && useradd --user-group horizon \ && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && ln -s /usr/share/openstack-dashboard/openstack_dashboard /usr/lib/python2.7/site-packages/openstack_dashboard \ && ln -s /usr/share/openstack-dashboard/static /usr/lib/python2.7/site-packages/static \ - && chown -R horizon: /etc/openstack-dashboard + && chown -R horizon: /etc/openstack-dashboard /usr/share/openstack-dashboard \ + && chown -R apache: /usr/share/openstack-dashboard/static RUN sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \ && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ |