From 5192e64c0ca0c70bc0aa3ca5fec1a96e63e75e3f Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Wed, 2 Nov 2016 17:29:20 +0300 Subject: [PATCH] Move compress step to Dockerfile instead of runtime Looks like the only missing thing was COMPRESS_OFFLINE = True in config Change-Id: I64bf3b494d153b0fc8650167b99e3926ce1d8489 --- docker/horizon/Dockerfile.j2 | 3 ++- service/files/local_settings.j2 | 1 + service/horizon.yaml | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 8d25c49..6ff28da 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -18,7 +18,8 @@ RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ && cp /horizon/manage.py /var/lib/microservices/venv/bin/manage.py \ && /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py collectstatic --noinput --clear \ - && chown -R horizon: /etc/openstack-dashboard /home/horizon /var/lib/microservices/venv/lib/python2.7/site-packages/static /horizon + && chown -R horizon: /etc/openstack-dashboard /home/horizon /var/lib/microservices/venv/lib/python2.7/site-packages/static /horizon \ + && /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py compress --force ENV PATH /var/lib/venv/bin:$PATH diff --git a/service/files/local_settings.j2 b/service/files/local_settings.j2 index 6c9e9a8..9e28bdc 100644 --- a/service/files/local_settings.j2 +++ b/service/files/local_settings.j2 @@ -713,3 +713,4 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES', # For more information see: # http://tinyurl.com/anticlickjack #DISALLOW_IFRAME_EMBED = True +COMPRESS_OFFLINE = True diff --git a/service/horizon.yaml b/service/horizon.yaml index acf92ff..932454a 100644 --- a/service/horizon.yaml +++ b/service/horizon.yaml @@ -18,8 +18,6 @@ service: pre: - name: chown-logs-dir command: "sudo /bin/chown horizon:horizon /var/log/ccp/horizon" - - name: horizon-compress - command: /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py compress --force daemon: dependencies: - keystone