diff --git a/Dockerfile.devel.yml b/Dockerfile.devel similarity index 96% rename from Dockerfile.devel.yml rename to Dockerfile.devel index ee08242..eeee404 100644 --- a/Dockerfile.devel.yml +++ b/Dockerfile.devel @@ -1,26 +1,26 @@ -FROM docker.io/library/python:3.13-trixie -ENV PYTHONUNBUFFERED=1 -ENV DEBUG="1" -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"] +FROM docker.io/library/python:3.13-trixie +ENV PYTHONUNBUFFERED=1 +ENV DEBUG="1" +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"] diff --git a/Dockerfile.prod b/Dockerfile.prod new file mode 100644 index 0000000..862ead1 --- /dev/null +++ b/Dockerfile.prod @@ -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"] diff --git a/tinywiki/settings.py b/tinywiki/settings.py index f63a0f1..f469cd2 100644 --- a/tinywiki/settings.py +++ b/tinywiki/settings.py @@ -4,7 +4,7 @@ from django.conf import settings from django_project.settings import STATIC_URL TINYWIKI_USER_CONFIG = getattr(settings, - "TINYWIKI_USER_CONFIG", + "TINYWIKI_USER_CONFIG", { "username":"TinyWiki", "email":"tinywiki@example.com" @@ -27,8 +27,12 @@ TINYWIKI_BOOSTRAP_TAGS = { } } -TINYWIKI_BASE_TEMPLATE = getattr(settings, - "TINYWIKI_BASE_TEMPLATE", - "tinywiki/base.html") +TINYWIKI_BASE_TEMPLATE = getattr( + settings, + "TINYWIKI_BASE_TEMPLATE", + getattr(settings, + "BASE_TEMPLATE", + "tinywiki/base.html") +) -USE_BOOTSTRAP = getattr(settings,"USE_BOOTSTRAP",False) +USE_BOOTSTRAP = getattr(settings, "USE_BOOTSTRAP", False)