diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-04 23:17:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-04 23:17:52 +0000 |
| commit | 32ce37cb8f22d19fe33901ccc81f0a7792e1416d (patch) | |
| tree | 5cd58698c28cdc779950096bdac4099d2ad8e799 /docker | |
| parent | 05b82db7016502300ed321a14f0d098ee330dc64 (diff) | |
| parent | dd8e1cb2eee2d0f767985425985c445743d04189 (diff) | |
| download | kolla-32ce37cb8f22d19fe33901ccc81f0a7792e1416d.tar.gz kolla-32ce37cb8f22d19fe33901ccc81f0a7792e1416d.zip | |
Merge "Fix horizon with ssl"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 03a8dcb1b..f1e8e4f3c 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -26,7 +26,9 @@ RUN apt-get install -y --no-install-recommends \ openstack-dashboard \ apache2 \ libapache2-mod-wsgi \ - && apt-get clean + && echo > /etc/apache2/ports.conf \ + && apt-get clean \ + && ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load 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 \ @@ -34,7 +36,6 @@ RUN cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/opens && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ && /usr/bin/python /usr/bin/manage.py collectstatic --noinput \ && 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 \ @@ -57,7 +58,8 @@ RUN apt-get install -y --no-install-recommends \ apache2 \ libapache2-mod-wsgi \ && echo > /etc/apache2/ports.conf \ - && apt-get clean + && apt-get clean \ + && ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load {% endif %} |