Disable compressor temporarily with hard coded files

revsys · Aug 28, 2024 · 27cbad6 · 27cbad6
1 parent 383787d
commit 27cbad6
Show file tree

Hide file tree

Showing 7 changed files with 252 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -80,8 +80,6 @@ COPY solr_conf /code/solr_conf
 RUN touch /code/nuremberg/__init__.py; \
     chown 1000 /code
 
-RUN ./manage.py compress
-
 USER 1000
 
 WORKDIR /code
@@ -107,7 +105,6 @@ COPY justfile /code/
 RUN pip install pytest-github-report
 RUN python -m zipfile -e /code/data/nuremberg_prod_dump_latest.sqlite3.zip /tmp
 
-RUN ./manage.py compress
 RUN ./manage.py collectstatic; chmod -R 777 /code/static
 RUN ./manage.py migrate
 

diff --git a/web/nuremberg/core/static/temporary/output.1b455b250099.css b/web/nuremberg/core/static/temporary/output.1b455b250099.css
diff --git a/web/nuremberg/core/static/temporary/output.455f73041fbb.js b/web/nuremberg/core/static/temporary/output.455f73041fbb.js
diff --git a/web/nuremberg/core/static/temporary/output.c024a9aa8b8b.js b/web/nuremberg/core/static/temporary/output.c024a9aa8b8b.js
diff --git a/web/nuremberg/core/static/temporary/output.c7cfe824ea65.js b/web/nuremberg/core/static/temporary/output.c7cfe824ea65.js
diff --git a/web/nuremberg/core/templates/base.html b/web/nuremberg/core/templates/base.html
@@ -10,10 +10,14 @@
 
     <title>Nuremberg - {% block title %}Base Page{% endblock %}</title>
 
+    {% comment %}
+    {# Compressor is temporarily disabled}
     {% compress css %}
       <link type="{% if COMPRESS_ENABLED %}text/less{% else %}text/css{% endif %}" rel="stylesheet" href="{% static 'style/base.less'|compile %}">
     {% endcompress %}
+    {% endcomment %}
 
+    <link type="text/css" rel="stylesheet" href="{% static 'temporary/output.1b455b250099.css' %}">
     {% if debug %}
     <script type="module">
         import RefreshRuntime from 'http://localhost:5173/static/@react-refresh'
@@ -55,6 +59,8 @@
     </footer>
 
     {% block javascript %}
+      {% comment %}
+      {# compressor is temporarily disabled #}
       {# compress all site JS into a single blob #}
       {% compress js %}
         <script src="{% static 'scripts/jquery-1.12.4.min.js' %}" type="text/javascript"></script>
@@ -79,7 +85,11 @@
           }
         });
       </script>
+    {% endcomment %}
     {% endblock %}
+    <script src="{% static 'temporary/output.c024a9aa8b8b.js' %}"></script>
+    <script src="{% static 'temporary/output.455f73041fbb.js' %}" defer></script>
+    <script src="{% static 'temporary/output.c7cfe824ea65.js' %}"></script>
     <!-- Google tag (gtag.js) -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-TE5D57P4M9"></script>
     <script>

diff --git a/web/nuremberg/settings.py b/web/nuremberg/settings.py
@@ -148,7 +148,6 @@
 COMPRESS_STORAGE = 'compressor.storage.OfflineManifestFileStorage'
 COMPRESS_OFFLINE = True
 COMPRESS_OFFLINE_MANIFEST = 'compress-manifest.json'
-COMPRESS_OUTPUT_DIR = os.path.join(BASE_DIR, 'core/static/')
 
 # whitenoise settings
 # https://warehouse.python.org/project/whitenoise/