diff options
| author | Mick Thompson <michael.a.thompson@oracle.com> | 2015-08-20 14:17:49 +0100 |
|---|---|---|
| committer | Mick Thompson <michael.a.thompson@oracle.com> | 2015-08-21 10:04:04 +0100 |
| commit | 37283874d07ffb19bc1717faf85fa80c0c230f39 (patch) | |
| tree | e2f704f365bdc92382ec091ef70ca93161c99f4c | |
| parent | daeea32cdff28c53015749eed93df8adf4007d64 (diff) | |
| download | kolla-37283874d07ffb19bc1717faf85fa80c0c230f39.tar.gz kolla-37283874d07ffb19bc1717faf85fa80c0c230f39.zip | |
Added missing configuration to horizon docker template.
Added missing copy and link commands:
&& cp -r /horizon/openstack_dashboard /usr/share/openstack-dashboard/ \
&& cp /horizon/openstack_dashboard/local/local_settings.py.example \
/etc/openstack-dashboard/local_settings \
&& ln -s /etc/openstack-dashboard/local_settings \
/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \
&& cp /horizon/manage.py /usr/share/openstack-dashboard \
&& python /usr/share/openstack-dashboard/manage.py collectstatic --noinput \
Changed 'mkdir -p /usr/share/openstack-dashboard/static' to 'mkdir -p /usr/share/openstack-dashboard'
Change-Id: Ia79c43d771ab2b3628112a9c4d0e6bb2d3348f4f
Closes-Bug: 1487028
| -rw-r--r-- | docker_templates/horizon/Dockerfile.j2 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/docker_templates/horizon/Dockerfile.j2 b/docker_templates/horizon/Dockerfile.j2 index d1ee8592e..dfd731939 100644 --- a/docker_templates/horizon/Dockerfile.j2 +++ b/docker_templates/horizon/Dockerfile.j2 @@ -35,7 +35,17 @@ RUN cd /horizon \ && useradd --user-group horizon \ && pip install -r requirements.txt \ && pip install /horizon \ - && mkdir -p /etc/openstack-dashboard /var/log/horizon /usr/share/openstack-dashboard/static \ + && mkdir -p \ + /etc/openstack-dashboard \ + /var/log/horizon \ + /usr/share/openstack-dashboard \ + && cp -r /horizon/openstack_dashboard /usr/share/openstack-dashboard/ \ + && cp /horizon/openstack_dashboard/local/local_settings.py.example \ + /etc/openstack-dashboard/local_settings \ + && ln -s /etc/openstack-dashboard/local_settings \ + /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \ + && cp /horizon/manage.py /usr/share/openstack-dashboard \ + && python /usr/share/openstack-dashboard/manage.py collectstatic --noinput \ && chown -R apache:apache /usr/share/openstack-dashboard/static \ && rm -rf /root/.cache |