cleanup in docker

2026-03-19 09:36:31 +01:00
parent 59ec73c8b7
commit 616fcacb60
8 changed files with 140 additions and 29 deletions
--- a/deploy_docker.sh
+++ b/deploy_docker.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e

-# --- Wczytaj zmienne z .env ---
 if [[ -f .env ]]; then
  set -a
  source .env
@@ -9,8 +8,8 @@ if [[ -f .env ]]; then
 fi

 APP_PORT="${APP_PORT:-8080}"
-
 PROFILE=$1
+COMPOSE_FILE="docker/compose.yml"

 if [[ -z "$PROFILE" ]]; then
  echo "Użycie: $0 {pgsql|mysql|sqlite}"
@@ -19,9 +18,9 @@ fi

 echo "Zatrzymuję kontenery aplikacji i bazy..."
 if [[ "$PROFILE" == "sqlite" ]]; then
-  docker compose stop
+  docker compose -f "$COMPOSE_FILE" stop
 else
-  docker compose --profile "$PROFILE" stop
+  docker compose -f "$COMPOSE_FILE" --profile "$PROFILE" stop
 fi

 echo "Pobieram najnowszy kod z repozytorium..."
@@ -35,9 +34,9 @@ git rev-parse --short HEAD > version.txt

 echo "Buduję i uruchamiam kontenery..."
 if [[ "$PROFILE" == "sqlite" ]]; then
-  docker compose up -d --build
+  docker compose -f "$COMPOSE_FILE" up -d --build
 else
-  DB_ENGINE="$PROFILE" docker compose --profile "$PROFILE" up -d --build
+  DB_ENGINE="$PROFILE" docker compose -f "$COMPOSE_FILE" --profile "$PROFILE" up -d --build
 fi

-echo "Gotowe! Wersja aplikacji: $(cat version.txt)"
+echo "Gotowe! Wersja aplikacji: $(cat version.txt)"
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,6 @@
 FROM python:3.14-trixie
-#FROM python:3.13-slim
 WORKDIR /app

-# Zależności systemowe do OCR, obrazów, tesseract i języka PL
 RUN apt-get update && apt-get install -y --no-install-recommends \
    tesseract-ocr \
    tesseract-ocr-pol \
@@ -14,21 +12,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*

-# Kopiujemy wymagania
 COPY requirements.txt requirements.txt

-# Instalujemy zależności
+RUN pip install --upgrade pip
 RUN pip install --no-cache-dir -r requirements.txt

-# Kopiujemy resztę aplikacji
 COPY . .

-# Kopiujemy entrypoint i ustawiamy uprawnienia
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

-# Otwieramy port
+
 #EXPOSE 8000

-# Ustawiamy entrypoint
 ENTRYPOINT ["/entrypoint.sh"]
--- a/docker/Dockerfile.alpine
+++ b/docker/Dockerfile.alpine
@@ -0,0 +1,46 @@
+FROM python:3.14-alpine
+
+WORKDIR /app
+
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+
+RUN apk add --no-cache \
+    tesseract-ocr \
+    tesseract-ocr-data-pol \
+    poppler-utils \
+    libstdc++ \
+    libffi \
+    openssl \
+    postgresql-libs \
+    zlib \
+    jpeg \
+    libpng \
+    openblas \
+    && apk add --no-cache --virtual .build-deps \
+    build-base \
+    python3-dev \
+    musl-dev \
+    linux-headers \
+    libffi-dev \
+    openssl-dev \
+    postgresql-dev \
+    zlib-dev \
+    jpeg-dev \
+    libpng-dev \
+    openblas-dev \
+    cmake \
+    cargo \
+    rust
+
+COPY requirements-stable.txt /app/requirements-stable.txt
+
+RUN pip install --no-cache-dir --upgrade pip setuptools wheel \
+    && pip install --no-cache-dir -r /app/requirements-stable.txt
+
+COPY . .
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
--- a/docker/Dockerfile.debian-slim
+++ b/docker/Dockerfile.debian-slim
@@ -0,0 +1,27 @@
+FROM python:3.14-slim-trixie
+WORKDIR /app
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    tesseract-ocr \
+    tesseract-ocr-pol \
+    libglib2.0-0 \
+    libsm6 \
+    libxrender1 \
+    libxext6 \
+    poppler-utils \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY requirements.txt requirements.txt
+
+RUN pip install --upgrade pip
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+#EXPOSE 8000
+
+ENTRYPOINT ["/entrypoint.sh"]
--- a/docker/Dockerfile.debian-stable-slim
+++ b/docker/Dockerfile.debian-stable-slim
@@ -0,0 +1,27 @@
+FROM python:3.14-slim-trixie
+WORKDIR /app
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    tesseract-ocr \
+    tesseract-ocr-pol \
+    libglib2.0-0 \
+    libsm6 \
+    libxrender1 \
+    libxext6 \
+    poppler-utils \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY requirements-stable.txt requirements.txt
+
+RUN pip install --upgrade pip
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+#EXPOSE 8000
+
+ENTRYPOINT ["/entrypoint.sh"]
--- a/docker/compose.yml
+++ b/docker/compose.yml
@@ -1,14 +1,11 @@
 services:
  app:
-    build: .
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile.debian-stable-slim
    container_name: lista-zakupow-app
    expose:
      - "${APP_PORT:-8000}"
-
-    # temporary
-    #ports:
-    #  - "9281:${APP_PORT:-8000}"
-
    healthcheck:
      test:
        [
@@ -22,11 +19,11 @@ services:
      retries: 3
      start_period: 10s
    env_file:
-      - .env
+      - ../.env
    volumes:
-      - .:/app
-      - ./uploads:/app/uploads
-      - ./instance:/app/instance
+      - ../:/app
+      - ../uploads:/app/uploads
+      - ../instance:/app/instance
    networks:
      - lista-zakupow_network
    restart: unless-stopped
@@ -40,7 +37,7 @@ services:
    ports:
      - "${APP_PORT:-8000}:80"
    volumes:
-      - ./deploy/varnish/default.vcl:/etc/varnish/default.vcl:ro
+      - ../deploy/varnish/default.vcl:/etc/varnish/default.vcl:ro
    environment:
      - VARNISH_SIZE=256m
    networks:
@@ -56,7 +53,7 @@ services:
      MYSQL_PASSWORD: ${DB_PASSWORD}
      MYSQL_ROOT_PASSWORD: 89o38kUX5T4C
    volumes:
-      - ./db/mysql:/var/lib/mysql
+      - ../db/mysql:/var/lib/mysql
    restart: unless-stopped
    networks:
      - lista-zakupow_network
@@ -71,7 +68,7 @@ services:
      POSTGRES_PASSWORD: ${DB_PASSWORD}
      PGDATA: /var/lib/postgresql
    volumes:
-      - ./db/pgsql/:/var/lib/postgresql
+      - ../db/pgsql:/var/lib/postgresql
    networks:
      - lista-zakupow_network
    restart: unless-stopped
@@ -79,4 +76,4 @@ services:

 networks:
  lista-zakupow_network:
-    driver: bridge
+    driver: bridge
--- a/docker/requirements-stable.txt
+++ b/docker/requirements-stable.txt
@@ -0,0 +1,21 @@
+bcrypt==5.0.0
+cryptography==46.0.5
+Flask==3.1.3
+Flask-Compress==1.23
+Flask-Login==0.6.3
+Flask-Session==0.8.0
+Flask-SocketIO==5.6.1
+Flask-SQLAlchemy==3.1.1
+flask-talisman==1.1.0
+gevent==25.9.1
+gevent-websocket==0.10.1
+opencv-python-headless>=4.12.0.88
+pdf2image==1.17.0
+pillow==12.1.1
+pillow_heif==1.3.0
+psutil==7.2.2
+psycopg2-binary==2.9.11
+PyMySQL==1.1.2
+pytesseract==0.3.13
+SQLAlchemy==2.0.48
+Werkzeug==3.1.6
--- a/docker/requirements.txt
+++ b/docker/requirements.txt