chris/django-tinywiki
1
0
Fork 0
mirror of https://git.cmoser.eu/tinytools/django-tinywiki.git synced 2026-02-04 06:06:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

2025.11.15 11:34:32 (cachyos)

Browse Source
This commit is contained in:
Christian Moser
2025-11-15 11:34:32 +01:00
parent 59c037a429
commit b5b7cb06f4
3 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Dockerfile.devel.yml → Dockerfile.devel
View File

@@ -1,26 +1,26 @@
FROM docker.io/library/python:3.13-trixie FROM docker.io/library/python:3.13-trixie
ENV PYTHONUNBUFFERED=1 ENV PYTHONUNBUFFERED=1
ENV DEBUG="1" ENV DEBUG="1"
ENV DATABASE_URL="sqlite:////data/database/tinywiki.sqlite" ENV DATABASE_URL="sqlite:////data/database/tinywiki.sqlite"
ENV MEDIA_URL="media/" ENV MEDIA_URL="media/"
ENV MEDIA_ROOT="/data/media" ENV MEDIA_ROOT="/data/media"
ENV STATIC_URL="static/" ENV STATIC_URL="static/"
ENV STATIC_ROOT="/data/static" ENV STATIC_ROOT="/data/static"
RUN apt update \ RUN apt update \
&& apt upgrade -y \ && apt upgrade -y \
&& apt install -y gettext libxmlsec1-dev xmlsec1\ && apt install -y gettext libxmlsec1-dev xmlsec1\
&& python -m pip install --upgrade pip \ && python -m pip install --upgrade pip \
&& pip install poetry \ && pip install poetry \
&& mkdir /app \ && mkdir /app \
&& mkdir -p /data/static /data/media /data/database && mkdir -p /data/static /data/media /data/database
VOLUME "/data" VOLUME "/data"
WORKDIR /app WORKDIR /app
COPY . . COPY . .
RUN poetry install --all-groups \ RUN poetry install --all-groups \
&& chmod 0755 start-django.sh && chmod 0755 start-django.sh
HEALTHCHECK --interval=30s --retries=5 --timeout=30s CMD curl -sS 127.0.0.1:8000 HEALTHCHECK --interval=30s --retries=5 --timeout=30s CMD curl -sS 127.0.0.1:8000
EXPOSE 8000 EXPOSE 8000
ENTRYPOINT ["/app/start-django.sh"] ENTRYPOINT ["/app/start-django.sh"]

26
Dockerfile.prod Normal file
View File

@@ -0,0 +1,26 @@
FROM docker.io/library/python:3.13-trixie
ENV PYTHONUNBUFFERED=1
ENV DEBUG="0"
ENV DATABASE_URL="sqlite:////data/database/tinywiki.sqlite"
ENV MEDIA_URL="media/"
ENV MEDIA_ROOT="/data/media"
ENV STATIC_URL="static/"
ENV STATIC_ROOT="/data/static"
RUN apt update \
&& apt upgrade -y \
&& apt install -y gettext libxmlsec1-dev xmlsec1\
&& python -m pip install --upgrade pip \
&& pip install poetry \
&& mkdir /app \
&& mkdir -p /data/static /data/media /data/database
VOLUME "/data"
WORKDIR /app
COPY . .
RUN poetry install --all-groups \
&& chmod 0755 start-django.sh
HEALTHCHECK --interval=30s --retries=5 --timeout=30s CMD curl -sS 127.0.0.1:8000
EXPOSE 8000
ENTRYPOINT ["/app/start-django.sh"]

14
tinywiki/settings.py
View File

@@ -4,7 +4,7 @@ from django.conf import settings
from django_project.settings import STATIC_URL from django_project.settings import STATIC_URL
TINYWIKI_USER_CONFIG = getattr(settings, TINYWIKI_USER_CONFIG = getattr(settings,
"TINYWIKI_USER_CONFIG", "TINYWIKI_USER_CONFIG",
{ {
"username":"TinyWiki", "username":"TinyWiki",
"email":"tinywiki@example.com" "email":"tinywiki@example.com"
@@ -27,8 +27,12 @@ TINYWIKI_BOOSTRAP_TAGS = {
} }
} }
TINYWIKI_BASE_TEMPLATE = getattr(settings, TINYWIKI_BASE_TEMPLATE = getattr(
"TINYWIKI_BASE_TEMPLATE", settings,
"tinywiki/base.html") "TINYWIKI_BASE_TEMPLATE",
getattr(settings,
"BASE_TEMPLATE",
"tinywiki/base.html")
)
USE_BOOTSTRAP = getattr(settings,"USE_BOOTSTRAP",False) USE_BOOTSTRAP = getattr(settings, "USE_BOOTSTRAP", False)