diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-13 02:13:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-13 02:13:04 +0000 |
| commit | a0a859ac9281dc28e7e0e2d3ae002b068af6f706 (patch) | |
| tree | 70fa425a09a63bbac8b2661dae532650c7f5021f /docker | |
| parent | c3341ab51a5ab8367efb93c7202d293bf3166fa4 (diff) | |
| parent | 328be709fde4cacc5bce6c6b6461e89474335fcb (diff) | |
| download | kolla-a0a859ac9281dc28e7e0e2d3ae002b068af6f706.tar.gz kolla-a0a859ac9281dc28e7e0e2d3ae002b068af6f706.zip | |
Merge "Fix missing config in horizon source image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos/source/horizon/Dockerfile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/docker/centos/source/horizon/Dockerfile b/docker/centos/source/horizon/Dockerfile index bf3445cfa..b2ae89a5f 100644 --- a/docker/centos/source/horizon/Dockerfile +++ b/docker/centos/source/horizon/Dockerfile @@ -9,14 +9,21 @@ RUN yum install -y \ mod_wsgi \ && yum clean all -# The chown is required because of this packaging bug: -# https://bugzilla.redhat.com/show_bug.cgi?id=1219006 - 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 \ + /usr/share/openstack-dashboard/static \ + /var/log/horizon \ + && 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 |