Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
Lukáš Kucharczyk | 615d4e59c6 | |
Lukáš Kucharczyk | 83f075e49d | |
Lukáš Kucharczyk | d3682368b4 |
|
@ -1,3 +1,11 @@
|
||||||
|
## 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
|
## 0.1.2 / 2023-01-07 22:05+01:00
|
||||||
|
|
||||||
* Switch to Uvicorn/Gunicorn + Caddy (https://git.kucharczyk.xyz/lukas/timetracker/pulls/4)
|
* Switch to Uvicorn/Gunicorn + Caddy (https://git.kucharczyk.xyz/lukas/timetracker/pulls/4)
|
||||||
|
|
|
@ -6,7 +6,7 @@ RUN npm install && \
|
||||||
|
|
||||||
FROM python:3.10.9-alpine
|
FROM python:3.10.9-alpine
|
||||||
|
|
||||||
ENV VERSION_NUMBER 0.1.2
|
ENV VERSION_NUMBER 0.1.2-3-g83f075e
|
||||||
ENV PROD 1
|
ENV PROD 1
|
||||||
|
|
||||||
RUN apk add \
|
RUN apk add \
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -44,7 +44,7 @@ shell:
|
||||||
poetry run python src/web/manage.py shell
|
poetry run python src/web/manage.py shell
|
||||||
|
|
||||||
collectstatic:
|
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.lock: pyproject.toml
|
||||||
poetry install
|
poetry install
|
||||||
|
|
|
@ -5,7 +5,7 @@ echo "Apply database migrations"
|
||||||
poetry run python src/web/manage.py migrate
|
poetry run python src/web/manage.py migrate
|
||||||
|
|
||||||
echo "Collect static files"
|
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"
|
echo "Starting server"
|
||||||
caddy start
|
caddy start
|
||||||
|
|
|
@ -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 = []
|
||||||
|
|
Loading…
Reference in New Issue