From 730330cba98cd714c2231259ef211ebbb9ccdc36 Mon Sep 17 00:00:00 2001
From: root <root@home.linuxiarz.pl>
Date: Wed, 23 Jul 2025 23:50:06 +0200
Subject: [PATCH] remove firebird

---
 .app.py.swp        | Bin 0 -> 1024 bytes
 .env.example       |  21 +++++++++++++++++++--
 config.py          |   2 --
 deploy_docker.sh   |  10 +++++-----
 docker-compose.yml |  15 +--------------
 requirements.txt   |   4 +++-
 6 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 .app.py.swp

diff --git a/.app.py.swp b/.app.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..5d0c0516659ce3340b74f8c58667a24c5c8c5dcb
GIT binary patch
literal 1024
zcmYc?$V<%2S1{KzVn6{MZ2SyG`S~R%f;c$EMP)c-P=yl<3iJvpQN>1iqaiRF0s|KU
E0D9vI3IG5A

literal 0
HcmV?d00001

diff --git a/.env.example b/.env.example
index 5f5f384..b6961b1 100644
--- a/.env.example
+++ b/.env.example
@@ -25,10 +25,27 @@ HEALTHCHECK_TOKEN=alamapsaikota123
 # sesja zalogowanego usera (domyślnie 7 dni)
 SESSION_TIMEOUT_MINUTES=10080
 
-# Rodzaj bazy: sqlite, pgsql, mysql, firebird
+# Rodzaj bazy: sqlite, pgsql, mysql
+# Mozliwe wartosci: sqlite / pgsql / mysql
 DB_ENGINE=sqlite
 
-# Wspólne zmienne (dla pgsql, mysql, firebird)
+# --- Konfiguracja dla sqlite ---
+# Plik bazy bedzie utworzony automatycznie w katalogu ./instance
+# Pozostale zmienne sa ignorowane przy DB_ENGINE=sqlite
+
+# --- Konfiguracja dla pgsql ---
+# Ustaw DB_ENGINE=pgsql
+# Domyslny port PostgreSQL to 5432
+# Wymaga dzialajacego serwera PostgreSQL (np. kontener `postgres`)
+# Przyklad URI: postgresql://user:pass@db:5432/myapp
+
+# --- Konfiguracja dla mysql ---
+# Ustaw DB_ENGINE=mysql
+# Domyslny port MySQL to 3306
+# Wymaga kontenera z MySQL i uzytkownika z dostepem do bazy
+# Przyklad URI: mysql+pymysql://user:pass@db:3306/myapp
+
+# Wspolne zmienne (dla pgsql, mysql)
 DB_HOST=db
 DB_PORT=5432
 DB_NAME=myapp
diff --git a/config.py b/config.py
index 82f6a43..7fdf671 100644
--- a/config.py
+++ b/config.py
@@ -11,8 +11,6 @@ class Config:
         SQLALCHEMY_DATABASE_URI = f"postgresql://{os.environ['DB_USER']}:{os.environ['DB_PASSWORD']}@{os.environ['DB_HOST']}:{os.environ.get('DB_PORT', 5432)}/{os.environ['DB_NAME']}"
     elif DB_ENGINE == "mysql":
         SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{os.environ['DB_USER']}:{os.environ['DB_PASSWORD']}@{os.environ['DB_HOST']}:{os.environ.get('DB_PORT', 3306)}/{os.environ['DB_NAME']}"
-    elif DB_ENGINE == "firebird":
-        SQLALCHEMY_DATABASE_URI = f"firebird+fdb://{os.environ['DB_USER']}:{os.environ['DB_PASSWORD']}@{os.environ['DB_HOST']}/{os.environ['DB_NAME']}.fdb"
     else:
         raise ValueError("Nieobsługiwany typ bazy danych.")
 
diff --git a/deploy_docker.sh b/deploy_docker.sh
index 1e8ff59..38047d3 100644
--- a/deploy_docker.sh
+++ b/deploy_docker.sh
@@ -4,21 +4,21 @@ set -e
 PROFILE=$1
 
 if [[ -z "$PROFILE" ]]; then
-  echo "Użycie: $0 {pgsql|mysql|firebird|sqlite}"
+  echo "Uzycie: $0 {pgsql|mysql|sqlite}"
   exit 1
 fi
 
-echo "Zatrzymuję i usuwam stare kontenery..."
+echo "Zatrzymuje kontenery aplikacji i bazy..."
 if [[ "$PROFILE" == "sqlite" ]]; then
-  docker compose down --rmi all
+  docker compose stop
 else
-  docker compose --profile "$PROFILE" down --rmi all
+  docker compose --profile "$PROFILE" stop
 fi
 
 echo "Pobieram najnowszy kod z repozytorium..."
 git pull
 
-echo "Buduję obrazy i uruchamiam kontenery..."
+echo "Buduje i uruchamiam kontenery..."
 if [[ "$PROFILE" == "sqlite" ]]; then
   docker compose up -d --build
 else
diff --git a/docker-compose.yml b/docker-compose.yml
index 5c89a6a..32278c1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       MYSQL_DATABASE: ${DB_NAME}
       MYSQL_USER: ${DB_USER}
       MYSQL_PASSWORD: ${DB_PASSWORD}
-      MYSQL_ROOT_PASSWORD: root
+      MYSQL_ROOT_PASSWORD: 89o38kUX5T4C
     volumes:
       - ./db/mysql:/var/lib/mysql
     ports:
@@ -48,16 +48,3 @@ services:
     restart: unless-stopped
     hostname: db
     profiles: ["mysql"]
-
-  firebird:
-    image: jacobalberty/firebird
-    container_name: firebird-db
-    environment:
-      ISC_PASSWORD: ${DB_PASSWORD}
-    volumes:
-      - ./db/firebird:/firebird/data
-    ports:
-      - "3050:3050"
-    restart: unless-stopped
-    hostname: db
-    profiles: ["firebird"]
diff --git a/requirements.txt b/requirements.txt
index 43127ab..c27062c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,4 +11,6 @@ pillow-heif
 
 pytesseract
 opencv-python-headless
-psycopg2-binary
+psycopg2-binary # pgsql
+pymysql         # mysql
+cryptography