diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-11 14:52:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-11 14:52:49 +0000 |
| commit | 421b4c6bcb91d0aebf8e6960e3380af0a8b8c33e (patch) | |
| tree | f3809278742bc2b549a6b8a02aaa356d07bfd563 | |
| parent | 853f0373293c1f5707875de09910f2c22637de69 (diff) | |
| parent | 3d24231be696665d962eae593f8c31d1b21c8174 (diff) | |
| download | kolla-421b4c6bcb91d0aebf8e6960e3380af0a8b8c33e.tar.gz kolla-421b4c6bcb91d0aebf8e6960e3380af0a8b8c33e.zip | |
Merge "Horizon ubuntu binary container"
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index d05cc8bd3..f55b26907 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -21,6 +21,28 @@ RUN sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/l && /usr/bin/python /usr/bin/manage.py collectstatic --noinput --clear \ && /usr/bin/python /usr/bin/manage.py compress --force + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + openstack-dashboard \ + apache2 \ + libapache2-mod-wsgi \ + && apt-get clean + +RUN cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \ + && sed -i "s|WEBROOT='/horizon/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings.py \ + && sed -i "s|^POLICY_FILES_PATH|POLICY_FILES_PATH = '/etc/openstack-dashboard'|" /etc/openstack-dashboard/local_settings.py \ + && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ + && /usr/bin/python /usr/bin/manage.py collectstatic --noinput \ + && /usr/bin/manage.py compress --force \ + && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \ + && echo "" > /etc/apache2/ports.conf \ + && rm /etc/openstack-dashboard/local_settings.py \ + && rm /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \ + && ln -s /etc/openstack-dashboard/local_settings /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \ + && 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 + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} |