Merge branch 'main' into develop

Author: GitTimeraider

.env.example

@@ -9,18 +9,9 @@ DATABASE_URL=sqlite:///subscriptions.db
 
 # Option 2: PostgreSQL
 # DATABASE_URL=postgresql://subscription_tracker:subscription_tracker@postgres:5432/subscription_tracker
-# POSTGRES_DB=subscription_tracker
-# POSTGRES_USER=subscription_tracker
-# POSTGRES_PASSWORD=subscription_tracker
-# POSTGRES_PORT=5432
 
 # Option 3: MariaDB/MySQL
 # DATABASE_URL=mysql+pymysql://subscription_tracker:subscription_tracker@mariadb:3306/subscription_tracker
-# MYSQL_DATABASE=subscription_tracker
-# MYSQL_USER=subscription_tracker
-# MYSQL_PASSWORD=subscription_tracker
-# MYSQL_ROOT_PASSWORD=root_password
-# MYSQL_PORT=3306
 
 # Email Configuration (SMTP)
 MAIL_SERVER=smtp.gmail.com

README.md

@@ -102,62 +102,6 @@ The application supports three database backends:
 - **PostgreSQL** - Robust relational database, recommended for production
 - **MariaDB/MySQL** - Popular relational database alternative
 
-### Quick Start (SQLite)
-
-1. **Clone the repository or use docker-compose:**
-   ```bash
-   docker-compose up -d
-   ```
-
-2. **Access the application:**
-   - Navigate to `http://localhost:5000`
-   - Default admin credentials: `admin` / `changeme`
-   - **⚠️ Change the default password immediately!**
-
-### Using PostgreSQL
-
-1. **Create environment file:**
-   ```bash
-   cp .env.example .env
-   ```
-
-2. **Configure PostgreSQL in .env:**
-   ```env
-   # Uncomment and configure these lines in .env
-   DATABASE_URL=postgresql://subscription_tracker:your_password@postgres:5432/subscription_tracker
-   POSTGRES_DB=subscription_tracker
-   POSTGRES_USER=subscription_tracker
-   POSTGRES_PASSWORD=your_secure_password
-   POSTGRES_PORT=5432
-   ```
-
-3. **Run with PostgreSQL:**
-   ```bash
-   docker-compose --profile postgres up -d
-   ```
-
-### Using MariaDB
-
-1. **Create environment file:**
-   ```bash
-   cp .env.example .env
-   ```
-
-2. **Configure MariaDB in .env:**
-   ```env
-   # Uncomment and configure these lines in .env
-   DATABASE_URL=mysql+pymysql://subscription_tracker:your_password@mariadb:3306/subscription_tracker
-   MYSQL_DATABASE=subscription_tracker
-   MYSQL_USER=subscription_tracker
-   MYSQL_PASSWORD=your_secure_password
-   MYSQL_ROOT_PASSWORD=your_root_password
-   MYSQL_PORT=3306
-   ```
-
-3. **Run with MariaDB:**
-   ```bash
-   docker-compose --profile mariadb up -d
-   ```
 
 ### Using Docker Compose (Manual Configuration)
 ```yaml
@@ -243,6 +187,18 @@ All of these are optional, though it is advised to use the SECRET_KEY and the MA
 | `PUID` | Host user ID to run the app process as (for mounted volume ownership) | 1000 |
 | `PGID` | Host group ID to run the app process as | 1000 |
 
+#### Database URL Examples
+```bash
+# SQLite (default)
+DATABASE_URL=sqlite:///subscriptions.db
+
+# PostgreSQL
+DATABASE_URL=postgresql://username:password@postgres:5432/database_name
+
+# MariaDB/MySQL
+DATABASE_URL=mysql+pymysql://username:password@mariadb:3306/database_name
+```
+
 #### Email Configuration Variables
 | Variable | Description | Default |
 |----------|-------------|---------|
@@ -259,34 +215,6 @@ All of these are optional, though it is advised to use the SECRET_KEY and the MA
 | `CURRENCY_REFRESH_MINUTES` | Freshness window for cached exchange rates (per provider) | 1440 (24h) |
 | `CURRENCY_PROVIDER_PRIORITY` | Comma list controlling provider fallback order | frankfurter,floatrates,erapi_open |
 
-#### PostgreSQL Database Variables
-| Variable | Description | Default |
-|----------|-------------|---------|
-| `POSTGRES_DB` | PostgreSQL database name | subscription_tracker |
-| `POSTGRES_USER` | PostgreSQL username | subscription_tracker |
-| `POSTGRES_PASSWORD` | PostgreSQL password | subscription_tracker |
-| `POSTGRES_PORT` | PostgreSQL port | 5432 |
-
-#### MariaDB/MySQL Database Variables
-| Variable | Description | Default |
-|----------|-------------|---------|
-| `MYSQL_DATABASE` | MySQL/MariaDB database name | subscription_tracker |
-| `MYSQL_USER` | MySQL/MariaDB username | subscription_tracker |
-| `MYSQL_PASSWORD` | MySQL/MariaDB password | subscription_tracker |
-| `MYSQL_ROOT_PASSWORD` | MySQL/MariaDB root password | root_password |
-| `MYSQL_PORT` | MySQL/MariaDB port | 3306 |
-
-#### Database URL Examples
-```bash
-# SQLite (default)
-DATABASE_URL=sqlite:///subscriptions.db
-
-# PostgreSQL
-DATABASE_URL=postgresql://username:password@postgres:5432/database_name
-
-# MariaDB/MySQL
-DATABASE_URL=mysql+pymysql://username:password@mariadb:3306/database_name
-```
 
 ### Exchange Rate Providers
 
@@ -609,3 +537,4 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 
 
+

docker-compose.yml

@@ -22,56 +22,11 @@ services:
       - CURRENCY_PROVIDER_PRIORITY=${CURRENCY_PROVIDER_PRIORITY:-frankfurter,floatrates,erapi_open}
       - PERFORMANCE_LOGGING=${PERFORMANCE_LOGGING:-true}
     volumes:
-      - ./data:/app/instance
+      - YOURDATAVOLUME:/app/instance
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:5000/health"]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 40s
     restart: unless-stopped
-
-  postgres:
-    image: postgres:15-alpine
-    environment:
-      - POSTGRES_DB=${POSTGRES_DB:-subscription_tracker}
-      - POSTGRES_USER=${POSTGRES_USER:-subscription_tracker}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-subscription_tracker}
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-    ports:
-      - "${POSTGRES_PORT:-5432}:5432"
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-subscription_tracker} -d ${POSTGRES_DB:-subscription_tracker}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 30s
-    profiles:
-      - postgres
-    restart: unless-stopped
-
-  mariadb:
-    image: mariadb:10.11
-    environment:
-      - MYSQL_DATABASE=${MYSQL_DATABASE:-subscription_tracker}
-      - MYSQL_USER=${MYSQL_USER:-subscription_tracker}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-subscription_tracker}
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root_password}
-    volumes:
-      - mariadb_data:/var/lib/mysql
-    ports:
-      - "${MYSQL_PORT:-3306}:3306"
-    healthcheck:
-      test: ["CMD", "/usr/local/bin/healthcheck.sh", "--connect", "--innodb_initialized"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 30s
-    profiles:
-      - mariadb
-    restart: unless-stopped
-
-volumes:
-  postgres_data:
-  mariadb_data: