aboutsummaryrefslogtreecommitdiff
path: root/docker/horizon
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-22 08:46:55 +0000
committerGerrit Code Review <review@openstack.org>2022-04-22 08:46:55 +0000
commit7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch)
tree0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/horizon
parent8650c57c12498c483445536af5b5a85ada87791e (diff)
parente21aeb5ae955671937055baf57836120af8d4312 (diff)
downloadkolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz
kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip
Merge "flatten images a bit"
Diffstat (limited to 'docker/horizon')
-rw-r--r--docker/horizon/Dockerfile.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index f66b020d0..1a2352e21 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -44,6 +44,8 @@ ADD plugins-archive /
'/plugins/*'
] %}
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
# NOTE(hrw): to install horizon from unpacked sources we cannot have it in upper-constraints.txt
RUN ln -s horizon-source/* horizon \
&& sed -i /^horizon=/d /requirements/upper-constraints.txt \
@@ -58,10 +60,8 @@ RUN ln -s horizon-source/* horizon \
&& for locale in /var/lib/kolla/venv/lib/python{{distro_python_version}}/site-packages/*/locale; do \
(cd ${locale%/*} && /var/lib/kolla/venv/bin/django-admin compilemessages) \
done \
- && chown -R horizon: /etc/openstack-dashboard
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
+ && chown -R horizon: /etc/openstack-dashboard \
+ && chmod 644 /usr/local/bin/kolla_extend_start
{% block horizon_footer %}{% endblock %}
{% block footer %}{% endblock %}