From baa64ef1bbf7822575b8ea06fb8d56656d61eb45 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 3 Dec 2024 20:08:08 +0500 Subject: [PATCH] build: update compil-sass theme-dir flags --- .../edxapp/templates/edx/bin/edxapp-update-assets.j2 | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/playbooks/roles/edxapp/templates/edx/bin/edxapp-update-assets.j2 b/playbooks/roles/edxapp/templates/edx/bin/edxapp-update-assets.j2 index b15d506064c..1d7a9c65a21 100644 --- a/playbooks/roles/edxapp/templates/edx/bin/edxapp-update-assets.j2 +++ b/playbooks/roles/edxapp/templates/edx/bin/edxapp-update-assets.j2 @@ -4,26 +4,18 @@ {% for override in edxapp_staticfiles_storage_overrides %} sudo -E -H -u {{ edxapp_user }} \ env "PATH=$PATH" \ - "STATICFILES_STORAGE={{ override }}" \ - "STATIC_ROOT=/edx/var/edxapp/staticfiles" \ - "STATIC_ROOT_LMS=/edx/var/edxapp/staticfiles" \ - "STATIC_ROOT_CMS=/edx/var/edxapp/staticfiles/studio" \ npm install \ && npm run webpack \ - && npm run compile-sass \ + && npm run compile-sass -- --theme-dir /edx/var/edx-themes/edx-themes/edx-platform --theme-dir /edx/app/edxapp/edx-platform/themes \ && {{ edxapp_venv_bin }}/python manage.py lms collectstatic --noinput --settings=$EDX_PLATFORM_SETTINGS \ && {{ edxapp_venv_bin }}/python manage.py cms collectstatic --noinput --settings=$EDX_PLATFORM_SETTINGS {% endfor %} {% else %} sudo -E -H -u {{ edxapp_user }} \ env "PATH=$PATH" \ - "STATICFILES_STORAGE=django.contrib.staticfiles.storage.StaticFilesStorage" \ - "STATIC_ROOT=/edx/var/edxapp/staticfiles" \ - "STATIC_ROOT_LMS=/edx/var/edxapp/staticfiles" \ - "STATIC_ROOT_CMS=/edx/var/edxapp/staticfiles/studio" \ npm install \ && npm run webpack \ - && npm run compile-sass \ + && npm run compile-sass -- --theme-dir /edx/var/edx-themes/edx-themes/edx-platform --theme-dir /edx/app/edxapp/edx-platform/themes \ && {{ edxapp_venv_bin }}/python manage.py lms collectstatic --noinput --settings=$EDX_PLATFORM_SETTINGS \ && {{ edxapp_venv_bin }}/python manage.py cms collectstatic --noinput --settings=$EDX_PLATFORM_SETTINGS {% endif %}