diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-21 08:01:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-21 08:01:06 +0000 |
| commit | a26fcb2b3b5334916655155302ed79b02c190360 (patch) | |
| tree | bede4ad110937549c52165a227dd55b0f454c057 /docker | |
| parent | 288469c4d3690edc07f8e9a912195935ac6dfc1b (diff) | |
| parent | 6a0e56cad308e03142219db7fb9458cfcf02e5ca (diff) | |
| download | kolla-a26fcb2b3b5334916655155302ed79b02c190360.tar.gz kolla-a26fcb2b3b5334916655155302ed79b02c190360.zip | |
Merge "Compile i18n messages for all projects who have locale folder"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 29a02534d..ded033143 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -40,8 +40,9 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/?[^_]*.py* \ && rm -f /usr/lib/python2.7/site-packages/openstack_dashboard/local/enabled/?[^_]*.py* \ - && (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) + && for locale in /usr/lib/python2.7/site-packages/*/locale; do \ + (cd ${locale%/*} && /usr/bin/python /usr/bin/manage.py compilemessages) \ + done {% endblock %} {% elif base_distro in ['debian', 'ubuntu'] %} @@ -75,8 +76,9 @@ RUN echo > /etc/apache2/ports.conf \ && 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 \ - && (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) + && for locale in /usr/lib/python2.7/site-packages/*/locale; do \ + (cd ${locale%/*} && /usr/bin/python /usr/bin/manage.py compilemessages) \ + done {% endblock %} {% endif %} @@ -137,8 +139,9 @@ RUN ln -s horizon-source/* horizon \ && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(horizon_plugins_pip_packages) }}; \ fi \ - && (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) \ + && for locale in /var/lib/kolla/venv/lib/python2.7/site-packages/*/locale; do \ + (cd ${locale%/*} && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \ + done \ && chown -R horizon: /etc/openstack-dashboard /var/lib/kolla/venv/lib/python2.7/site-packages/static {% endif %} |