FreakU
/
takahe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the collectstatic hack slightly better

This commit is contained in:
Andrew Godwin 2022-12-16 19:51:19 -07:00
parent 770f6728f6
commit 4a28e1708e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/uris.py
View File

@ -1,3 +1,4 @@
import sys
from urllib.parse import urljoin from urllib.parse import urljoin
from django.conf import settings from django.conf import settings
@ -41,7 +42,15 @@ class StaticAbsoluteUrl(RelativeAbsoluteUrl):
""" """
def __init__(self, path: str): def __init__(self, path: str):
try:
static_url = staticfiles_storage.url(path) static_url = staticfiles_storage.url(path)
except ValueError:
# Suppress static issues during the first collectstatic
# Yes, I know it's a big hack! Pull requests welcome :)
if "collectstatic" in sys.argv:
super().__init__("https://example.com/")
return
raise
if "://" in static_url: if "://" in static_url:
super().__init__(static_url) super().__init__(static_url)
else: else:

2
docker/Dockerfile
View File

@ -32,7 +32,7 @@ COPY . /takahe
WORKDIR /takahe WORKDIR /takahe
RUN TAKAHE_DATABASE_SERVER="postgres://x@example.com/x" TAKAHE_DEBUG=true python3 manage.py collectstatic --noinput RUN TAKAHE_DATABASE_SERVER="postgres://x@example.com/x" python3 manage.py collectstatic --noinput
EXPOSE 8000 EXPOSE 8000