Some debt.

diff --git a/Dockerfile b/Dockerfile
index f916be0..ed113fe 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,12 @@
-FROM python:3.8 AS base
+FROM python:3.9-trixie AS base
+
+ARG UID=1000
+ARG GID=1000

 
 RUN     apt-get update && apt-get install -y \
        git \
        calibre \
        texlive-xetex texlive-lang-polish \
 
 RUN     apt-get update && apt-get install -y \
        git \
        calibre \
        texlive-xetex texlive-lang-polish \

-       libespeak-dev
-
-COPY requirements/requirements.txt requirements.txt
-
-# numpy -> aeneas
-RUN pip install numpy
-RUN pip install aeneas
-
-RUN pip install --no-cache-dir -r requirements.txt
-RUN pip install --no-cache-dir \
-    psycopg2-binary \
-    django-debug-toolbar==3.2.2 \
-    python-bidi
-
-RUN     apt-get install -y \

        texlive-extra-utils \
        texlive-lang-greek \
        texlive-lang-other \
        texlive-extra-utils \
        texlive-lang-greek \
        texlive-lang-other \


@@ -28,12 +16,26 @@ RUN     apt-get install -y \
        fonts-noto-core fonts-noto-extra
 
 
        fonts-noto-core fonts-noto-extra
 
 

+COPY requirements/requirements.txt requirements.txt
+
+RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir \
+    psycopg2-binary \
+    django-debug-toolbar==3.2.2
+
+RUN addgroup --gid $GID app && \
+    adduser --gid $GID --home /app --uid $UID app
+
+

 # fonts
 # fonts

-RUN cp -a /usr/local/lib/python*/site-packages/librarian/fonts /usr/local/share/fonts
+RUN cp -a /usr/local/lib/python*/site-packages/librarian/fonts /usr/share/fonts

 RUN fc-cache
 
 RUN fc-cache
 

+USER app
+

 WORKDIR /app/src
 
 WORKDIR /app/src
 

+RUN mkdir /app/.ipython

 
 FROM base AS dev
 
 
 FROM base AS dev
 

diff --git a/Makefile b/Makefile
index 2d7d105..98a6898 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-.PHONY: deploy test shell
+.PHONY: deploy test up down build shell logs restart

 
 
 
 

-UID != id -u
-GID != id -g
+UID := $(shell id -u)
+GID := $(shell id -g)

 
 
 deploy: src/wolnelektury/localsettings.py
 
 
 deploy: src/wolnelektury/localsettings.py


@@ -23,9 +23,20 @@ test:
        rm .coverage
 
 
        rm .coverage
 
 

-shell:
-       UID=$(UID) GID=$(GID) docker compose run --rm dev bash
+up:
+       UID=$(UID) GID=$(GID) docker compose up --build -d

 
 

+down:
+       docker compose down

 
 build:
 
 build:

-       docker compose build dev
+       UID=$(UID) GID=$(GID) docker compose build
+
+shell:
+       UID=$(UID) GID=$(GID) docker compose run --rm web bash
+
+logs:
+       docker compose logs -f
+
+restart:
+       docker compose restart

diff --git a/docker-compose.yml b/docker-compose.yml
index 8761250..b651509 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,22 +1,48 @@
+x-app-base: &app-base
+  build:
+    context: .
+    target: dev
+    args:
+      UID: ${UID:-1000}
+      GID: ${GID:-1000}
+  env_file:
+   - .env
+  volumes:
+   - ./src:/app/src
+   - ./var/media:/app/var/media
+   - ./var/static:/app/var/static
+   - ./var/counters/:/app/var/counters
+   - ipython:/app/.ipython
+  depends_on:
+   - db
+   - redis
+   - memcached
+

 services:
 services:

-  dev:
-    build:
-      context: .
-      target: dev
-    user: "${UID}:${GID}"
-    volumes:
-      - ./src:/app/src
-      - ./var/media:/app/var/media
-      - ./var/static:/app/var/static
-      - ./var/counters/:/app/var/counters
-    depends_on:
-      - db
-    env_file:
-      - .env
+  web:
+    <<: *app-base
+    ports:
+     - "8000:8000"
+    command: ./manage.py runserver 0.0.0.0:8000
+
+  celery:
+    <<: *app-base
+    command: celery -A wolnelektury worker -l info
+

   db:
   db:

-    image: postgres:18.0
+    image: postgres:18

     container_name: db
     env_file:
       - .env
     volumes:
       - ./var/postgresql-data/:/var/lib/postgresql/
     container_name: db
     env_file:
       - .env
     volumes:
       - ./var/postgresql-data/:/var/lib/postgresql/

+
+  redis:
+    image: redis:8-alpine
+
+  memcached:
+    image: memcached:1.6-alpine
+
+
+volumes:
+  ipython:
\ No newline at end of file

diff --git a/manage b/manage
deleted file mode 100755 (executable)
index b70a319..0000000
--- a/manage
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-export UID=`id -u`
-export GID=`id -g`
-
-if [ "$1" = "runserver" ]
-then
-    PORT="$2"
-    [ -z "$PORT" ] && PORT=8000
-    EXPOSED=127.0.0.1:"$PORT"
-    echo "expose as: $EXPOSED"
-    exec docker compose run --rm -p "$EXPOSED":"$PORT" dev python $PYARGS manage.py runserver 0.0.0.0:"$PORT"
-else
-    exec docker compose run --rm dev python $PYARGS manage.py "$@"
-fi

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 5f7496e..1fba04c 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -42,7 +42,7 @@ mutagen==1.47
 sorl-thumbnail==12.10.0
 
 # home-brewed & dependencies
 sorl-thumbnail==12.10.0
 
 # home-brewed & dependencies

-librarian==25.12
+librarian==26.2

 
 # celery tasks
 celery[redis]==5.4.0
 
 # celery tasks
 celery[redis]==5.4.0


@@ -62,3 +62,4 @@ python-slugify==8.0.4
 firebase-admin==6.6.0
 Wikidata==0.8.1
 
 firebase-admin==6.6.0
 Wikidata==0.8.1
 

+ipython

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index 918bed9..869a78d 100644 (file)
--- a/src/wolnelektury/settings/basic.py
+++ b/src/wolnelektury/settings/basic.py
@@ -17,6 +17,23 @@ ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '').split()
 
 CACHE_MIDDLEWARE_SECONDS = 3 * 60
 
 
 CACHE_MIDDLEWARE_SECONDS = 3 * 60
 

+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'TIMEOUT': 180,
+        'LOCATION': [
+            'memcached:11211',
+        ],
+    },
+    'template_fragments': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'TIMEOUT': 86400,
+        'LOCATION': [
+            'memcached:11211',
+        ],
+    },
+}
+

 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',

diff --git a/src/wolnelektury/settings/celery.py b/src/wolnelektury/settings/celery.py
index 3789863..1abda08 100644 (file)
--- a/src/wolnelektury/settings/celery.py
+++ b/src/wolnelektury/settings/celery.py
@@ -1,6 +1,7 @@
 # This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
 # This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #

+CELERY_BROKER_URL = 'redis://redis'

 CELERY_TASK_EAGER_PROPAGATES = True
 CELERY_SEND_TASK_ERROR_EMAILS = True
 CELERY_ACCEPT_CONTENT = ['pickle']
 CELERY_TASK_EAGER_PROPAGATES = True
 CELERY_SEND_TASK_ERROR_EMAILS = True
 CELERY_ACCEPT_CONTENT = ['pickle']