diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-07 13:51:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-07 13:51:45 +0000 |
| commit | 9050f4bf71e652ecabfd3a583c0c0c1f495a6f98 (patch) | |
| tree | 56e2f51c96d8b4e48111cb7d8cfb3e8864706272 | |
| parent | 14b5636e0ccef96953416bf80d1251bfa4074638 (diff) | |
| parent | 82e9091c8dc676815239924890121801d54ea158 (diff) | |
| download | kolla-9050f4bf71e652ecabfd3a583c0c0c1f495a6f98.tar.gz kolla-9050f4bf71e652ecabfd3a583c0c0c1f495a6f98.zip | |
Merge "Run collect static during container startup when necessarily"
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 3c9912cbe..cdaa8288c 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -26,7 +26,6 @@ RUN useradd --user-group horizon \ && chown -R apache: /usr/share/openstack-dashboard/static \ && sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \ && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ - && /usr/bin/python /usr/bin/manage.py collectstatic --noinput --clear \ && (cd /usr/lib/python2.7/site-packages/horizon && /usr/bin/python /usr/bin/manage.py compilemessages) \ && (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages) {% endblock %} @@ -51,7 +50,6 @@ RUN echo > /etc/apache2/ports.conf \ && 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 \ && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \ && rm /etc/openstack-dashboard/local_settings.py \ && rm /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \ @@ -110,7 +108,6 @@ RUN ln -s horizon-source/* horizon \ ln -s `find /plugins -name 'neutron-lbaas-dashboard-*' -type d`/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py \ /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py; \ fi \ - && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py collectstatic --noinput --clear \ && (cd /var/lib/kolla/venv/lib/python2.7/site-packages/horizon && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \ && (cd /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \ && chown -R horizon: /etc/openstack-dashboard /home/horizon /var/lib/kolla/venv/lib/python2.7/site-packages/static diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 4db20fd8d..b91afb98e 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -29,8 +29,10 @@ if [[ ! -f ${MD5SUM_TXT_PATH} || $(md5sum -c --status ${MD5SUM_TXT_PATH};echo $? md5sum /etc/openstack-dashboard/local_settings > ${MD5SUM_TXT_PATH} if [[ "${KOLLA_INSTALL_TYPE}" == "binary" ]]; then /usr/bin/manage.py compress --force + /usr/bin/manage.py collectstatic --noinput --clear elif [[ "${KOLLA_INSTALL_TYPE}" == "source" ]]; then /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compress --force + /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py collectstatic --noinput --clear fi fi |