summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-08-22 10:27:31 +0000
committerGerrit Code Review <review@openstack.org>2019-08-22 10:27:31 +0000
commitff6b0485cd935686e2d6c19fed7395f24d1537b0 (patch)
tree993d1c4a3262b36c0350fc33c1476e9ca039b52c /docker
parent904f1fcbd7b1bf133547980eed7807b06a51ef3b (diff)
parent510c2d8f9583970a48fd1d66cfa4d00e0395a0c7 (diff)
downloadkolla-ff6b0485cd935686e2d6c19fed7395f24d1537b0.tar.gz
kolla-ff6b0485cd935686e2d6c19fed7395f24d1537b0.zip
Merge "Fixes wrong local_setting.py file issue for Ubuntu binary deployment." into stable/stein
Diffstat (limited to 'docker')
-rw-r--r--docker/horizon/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index cda759521..800eae2a1 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -83,6 +83,8 @@ RUN echo > /etc/apache2/ports.conf \
&& cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
&& rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
+ && rm /etc/openstack-dashboard/local_settings.py \
+ && ln -s /etc/openstack-dashboard/local_settings /etc/openstack-dashboard/local_settings.py \
&& for locale in /usr/lib/python{{distro_python_version}}/site-packages/*/locale; do \
(cd ${locale%/*} && /usr/bin/python3 /usr/bin/manage.py compilemessages) \
done