Fix collectstaticfiles causing error when restarting container

Fixes #23

.dockerignore

@@ -0,0 +1 @@
+src/web/static/*

CHANGELOG.md

@@ -1,3 +1,15 @@
+## Unreleased
+
+* Fix collectstaticfiles causing error when restarting container (https://git.kucharczyk.xyz/lukas/timetracker/issues/23)
+
+## 0.1.3 / 2023-01-08 15:23+01:00
+
+* Fix CSRF error (https://git.kucharczyk.xyz/lukas/timetracker/pulls/22)
+
+## 0.1.2 / 2023-01-07 22:05+01:00
+
+* Switch to Uvicorn/Gunicorn + Caddy (https://git.kucharczyk.xyz/lukas/timetracker/pulls/4)
+
 ## 0.1.1 / 2023-01-05 23:26+01:00
 * Order by timestamp_start by default
 * Add pre-commit hook to update version

Dockerfile

@@ -6,10 +6,11 @@ RUN npm install && \
 
 FROM python:3.10.9-alpine
 
-ENV VERSION_NUMBER 0.1.1-3-gd029fda
+ENV VERSION_NUMBER 0.1.2-3-g83f075e
 ENV PROD 1
 
 RUN apk add \
+    bash \
     vim \
     curl \
     caddy

Makefile

@@ -1,5 +1,3 @@
-.PHONY: createsuperuser shell cleanstatic
-
 all: css migrate
 
 initialize: npm css migrate sethookdir loadplatforms
@@ -24,8 +22,11 @@ migrate: makemigrations
 dev: migrate sethookdir
 	poetry run python src/web/manage.py runserver_plus
 
+caddy:
+	caddy run --watch
+
 dev-prod: migrate collectstatic sethookdir
-	cd src/web/; poetry run python -m gunicorn --bind 0.0.0.0:8001 web.asgi:application -k uvicorn.workers.UvicornWorker
+	cd src/web/; PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 web.asgi:application -k uvicorn.workers.UvicornWorker
 
 dumptracker:
 	poetry run python src/web/manage.py dumpdata --format yaml tracker --output tracker_fixture.yaml
@@ -43,7 +44,7 @@ shell:
 	poetry run python src/web/manage.py shell
 
 collectstatic:
-	poetry run python src/web/manage.py collectstatic
+	poetry run python src/web/manage.py collectstatic -c --no-input
 
 poetry.lock: pyproject.toml
 	poetry install
@@ -60,4 +61,4 @@ date:
 cleanstatic:
 	rm -r src/web/static/*
 
-clean: cleanstatic
+clean: cleanstatic

docker-compose.yml

@@ -1,9 +1,10 @@
 ---
-version: "2.1"
 services:
   timetracker:
     image: registry.kucharczyk.xyz/timetracker
-    build: Dockerfile
+    build:
+      context: .
+      dockerfile: Dockerfile
     container_name: timetracker
     environment:
       - TZ=Europe/Prague

entrypoint.sh

@@ -5,9 +5,9 @@ echo "Apply database migrations"
 poetry run python src/web/manage.py migrate
 
 echo "Collect static files"
-poetry run python src/web/manage.py collectstatic
+poetry run python src/web/manage.py collectstatic --clear --no-input
 
 echo "Starting server"
-caddy run
+caddy start
 cd src/web || exit
 poetry run python -m gunicorn --bind 0.0.0.0:8001 web.asgi:application -k uvicorn.workers.UvicornWorker

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "timetracker"
-version = "0.1.1"
+version = "0.1.2"
 description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"

src/web/web/settings.py

@@ -145,7 +145,8 @@ LOGGING = {
     },
 }
 
-CSRF_TRUSTED_ORIGINS = []
+_csrf_trusted_origins = os.environ.get("CSRF_TRUSTED_ORIGINS")
-
+if _csrf_trusted_origins:
-if os.environ.get("PROD"):
+    CSRF_TRUSTED_ORIGINS = _csrf_trusted_origins.split(",")
-    CSRF_TRUSTED_ORIGINS.append(os.environ.get("CSRF_TRUSTED_ORIGINS"))
+else:
+    CSRF_TRUSTED_ORIGINS = []

src/web/web/urls.py

@@ -16,10 +16,13 @@ Including another URLconf
 from django.contrib import admin
 from django.urls import include, path
 from django.views.generic import RedirectView
+from django.conf import settings
 
 
 urlpatterns = [
-    path("admin/", admin.site.urls),
     path("", RedirectView.as_view(url="/tracker/list-sessions")),
     path("tracker/", include("tracker.urls")),
 ]
+
+if settings.DEBUG:
+    urlpatterns.append(path("admin/", admin.site.urls))