From 6e9fad7a93840a72b4380868f0c3fa43fedfd615 Mon Sep 17 00:00:00 2001 From: saint Date: Sun, 25 Feb 2024 15:51:10 +0100 Subject: [PATCH] added dependencies in Dockerfile and better handling of docker volumes to not lose data on recreated containers --- .gitignore | 4 ++++ Dockerfile | 2 +- compose.yaml | 5 ++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 602005a5..ec649c25 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,7 @@ celery_worker.py # sensitive data .env.docker .gunicorn.conf.py + +# local volumes for docker +media/ +pgdata/ diff --git a/Dockerfile b/Dockerfile index 157ae805..b10e111b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM --platform=$BUILDPLATFORM python:3-alpine AS builder RUN apk update RUN apk add pkgconfig -RUN apk add --virtual build-deps gcc python3-dev musl-dev +RUN apk add --virtual build-deps gcc python3-dev musl-dev tesseract-ocr tesseract-ocr-data-eng WORKDIR /app COPY . /app diff --git a/compose.yaml b/compose.yaml index 2f66927a..e8c66574 100644 --- a/compose.yaml +++ b/compose.yaml @@ -5,7 +5,7 @@ services: env_file: - ./.env.docker volumes: - - pgdata:/var/lib/postgresql/data + - ./pgdata:/var/lib/postgresql/data redis: image: redis env_file: @@ -29,6 +29,7 @@ services: volumes: - ./.env:/app/.env - ./.gunicorn.conf.py:/app/gunicorn.conf.py + - ./media/:/app/app/static/media/ ports: - '8080:5000' adminer: @@ -36,7 +37,5 @@ services: restart: always ports: - 8888:8080 -volumes: - pgdata: