Rebase edits from main
This commit is contained in:
+13
-2
@@ -1,15 +1,26 @@
|
|||||||
|
# Application configuration
|
||||||
MAX_CONTENT_LENGTH=1048576
|
MAX_CONTENT_LENGTH=1048576
|
||||||
MAX_PENDING_TIME=600
|
MAX_PENDING_TIME=600
|
||||||
MAX_STORE_TIME=259200
|
MAX_STORE_TIME=259200
|
||||||
|
CLEAR_AT_RESTART=1
|
||||||
|
SKIP_IHDR_FILL=1
|
||||||
|
|
||||||
|
# Flask configuration
|
||||||
FLASK_DEBUG=0
|
FLASK_DEBUG=0
|
||||||
FLASK_ENV=development
|
FLASK_ENV=development
|
||||||
DB_URI=postgresql://aperiuser:aperipass@postgres:5432/aperisolve
|
|
||||||
|
# Redis configuration
|
||||||
RQ_DASHBOARD_REDIS_URL=redis://redis:6379/0
|
RQ_DASHBOARD_REDIS_URL=redis://redis:6379/0
|
||||||
|
|
||||||
|
# Database configuration
|
||||||
POSTGRES_DB=aperisolve
|
POSTGRES_DB=aperisolve
|
||||||
POSTGRES_USER=aperiuser
|
POSTGRES_USER=aperiuser
|
||||||
POSTGRES_PASSWORD=aperipass
|
POSTGRES_PASSWORD=aperipass
|
||||||
|
DB_URI=postgresql://aperiuser:aperipass@postgres:5432/aperisolve
|
||||||
|
|
||||||
|
# Sentry configuration
|
||||||
SENTRY_DSN=https://your-dsn@sentry.io/project-id
|
SENTRY_DSN=https://your-dsn@sentry.io/project-id
|
||||||
SENTRY_TRACES_SAMPLE_RATE=0.1
|
SENTRY_TRACES_SAMPLE_RATE=0.1
|
||||||
SENTRY_PROFILES_SAMPLE_RATE=0.1
|
SENTRY_PROFILES_SAMPLE_RATE=0.1
|
||||||
SENTRY_RELEASE=1.0.0
|
SENTRY_RELEASE=1.0.0
|
||||||
ENVIRONMENT=development
|
SENTRY_ENVIRONMENT=development
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- .env.example
|
- .env.example
|
||||||
|
|
||||||
|
|
||||||
rqdashboard:
|
rqdashboard:
|
||||||
image: eoranged/rq-dashboard
|
image: eoranged/rq-dashboard
|
||||||
container_name: rq-dashboard
|
container_name: rq-dashboard
|
||||||
|
|||||||
+10
-2
@@ -17,6 +17,12 @@ services:
|
|||||||
condition: service_started
|
condition: service_started
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "dd if=/dev/urandom of=/tmp/healthcheck.png bs=1 count=1000000 && curl -X POST -F 'image=@/tmp/healthcheck.png' http://localhost:5000/upload -s -o /dev/null -w '%{http_code}' | grep -q 200"]
|
||||||
|
interval: 3600s
|
||||||
|
timeout: 30s
|
||||||
|
retries: 3
|
||||||
|
start_period: 900s
|
||||||
|
|
||||||
worker:
|
worker:
|
||||||
image: ghcr.io/zeecka/aperisolve:latest
|
image: ghcr.io/zeecka/aperisolve:latest
|
||||||
@@ -31,13 +37,15 @@ services:
|
|||||||
- postgres
|
- postgres
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
environment:
|
||||||
|
- CLEAR_AT_RESTART=0 # Always false for worker to prevent double clearing
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:14
|
image: postgres:18
|
||||||
container_name: postgres
|
container_name: postgres
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- pgdata:/var/lib/postgresql/data
|
- pgdata:/var/lib/postgresql
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -U aperiuser -d aperisolve"]
|
test: ["CMD-SHELL", "pg_isready -U aperiuser -d aperisolve"]
|
||||||
interval: 5s
|
interval: 5s
|
||||||
|
|||||||
Reference in New Issue
Block a user