diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-22 09:42:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-22 09:42:15 +0000 |
| commit | c778749bc79bc235d58730367e8c8b8448f96512 (patch) | |
| tree | ca1a7d23b32e6257d0a069a713164ced7568b4cb /docker | |
| parent | e364113adcb529cc06575133b0e377526516f715 (diff) | |
| parent | 46f8eed88a865adbbf564aae6949a0e2a39f3c31 (diff) | |
| download | kolla-c778749bc79bc235d58730367e8c8b8448f96512.tar.gz kolla-c778749bc79bc235d58730367e8c8b8448f96512.zip | |
Merge "Fix horizon debian binary docker image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index ec3a5e233..db28421ca 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -92,9 +92,10 @@ RUN echo > /etc/apache2/ports.conf \ && for locale in /usr/lib/python3/dist-packages/*/locale; do \ (cd ${locale%/*} && /usr/bin/django-admin compilemessages) \ done {% if install_type == 'binary' and base_distro == 'debian' %} \ - && find /etc/openstack-dashboard/enabled/ -type f | grep -Ev \ - `dpkg -L openstack-dashboard python3-django-horizon | \ - grep '/etc/openstack-dashboard/enabled/' | sed 's/\.py/.*.py/g' |xargs -l1 basename | xargs | tr ' ' '|'` | xargs rm + && rm -rf /etc/openstack-dashboard/enabled/* \ + /etc/openstack-dashboard/local_settings.d/* \ + /usr/lib/python3/dist-packages/openstack_dashboard/conf \ + && mv /etc/openstack-dashboard/policy /usr/lib/python3/dist-packages/openstack_dashboard/conf {% endif %} {% endblock %} |