mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-08 20:10:17 +02:00
collapse docker compose to make discord less unhappy
This commit is contained in:
parent
eaba01ad97
commit
dc0c1a2818
@ -28,11 +28,7 @@ x-allianceauth-base: &allianceauth-base
|
||||
|
||||
x-allianceauth-health-check: &allianceauth-health-checks
|
||||
healthcheck:
|
||||
test: [
|
||||
"CMD",
|
||||
"/memory_check.sh",
|
||||
"500000000"
|
||||
]
|
||||
test: ["CMD", "/memory_check.sh", "500000000"]
|
||||
interval: 60s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
@ -89,47 +85,25 @@ services:
|
||||
max-file: "5"
|
||||
|
||||
allianceauth_gunicorn:
|
||||
ports:
|
||||
- 8000:8000
|
||||
container_name: allianceauth_gunicorn
|
||||
<<: [*allianceauth-base]
|
||||
entrypoint: [
|
||||
"gunicorn",
|
||||
"myauth.wsgi",
|
||||
"--bind=0.0.0.0:8000",
|
||||
"--workers=3",
|
||||
"--timeout=120",
|
||||
"--max-requests=500",
|
||||
"--max-requests-jitter=50"
|
||||
]
|
||||
entrypoint: ["gunicorn", "myauth.wsgi", "--bind=0.0.0.0:8000", "--workers=3", "--timeout=120", "--max-requests=500", "--max-requests-jitter=50"]
|
||||
ports:
|
||||
- 8000:8000
|
||||
|
||||
allianceauth_beat:
|
||||
container_name: allianceauth_worker_beat
|
||||
<<: [*allianceauth-base]
|
||||
entrypoint: [
|
||||
"celery",
|
||||
"-A",
|
||||
"myauth",
|
||||
"beat"
|
||||
]
|
||||
entrypoint: ["celery", "-A", "myauth", "beat"]
|
||||
|
||||
allianceauth_worker:
|
||||
<<: [*allianceauth-base, *allianceauth-health-checks]
|
||||
entrypoint: [
|
||||
"celery",
|
||||
"-A",
|
||||
"myauth",
|
||||
"worker",
|
||||
"--pool=threads",
|
||||
"--concurrency=5",
|
||||
"-n",
|
||||
"worker_%n"
|
||||
]
|
||||
entrypoint: ["celery", "-A", "myauth", "worker", "--pool=threads", "--concurrency=5", "-n", "worker_%n"]
|
||||
deploy:
|
||||
replicas: 2
|
||||
|
||||
grafana:
|
||||
image: grafana/grafana-oss:11.2.0
|
||||
image: grafana/grafana-oss:latest
|
||||
restart: always
|
||||
depends_on:
|
||||
- auth_mysql
|
||||
@ -156,13 +130,6 @@ services:
|
||||
- ${PROXY_HTTP_PORT:-80}:80
|
||||
- ${PROXY_DASH_PORT:-81}:81
|
||||
- ${PROXY_HTTPS_PORT:-443}:443
|
||||
# Uncomment this section to use a dedicated database for Nginx Proxy Manager
|
||||
# environment:
|
||||
# DB_MYSQL_HOST: "proxy-db"
|
||||
# DB_MYSQL_PORT: 3306
|
||||
# DB_MYSQL_USER: "npm"
|
||||
# DB_MYSQL_PASSWORD: "${PROXY_MYSQL_PASS?err}"
|
||||
# DB_MYSQL_NAME: "npm"
|
||||
volumes:
|
||||
- proxy-data:/data
|
||||
- proxy-le:/etc/letsencrypt
|
||||
@ -174,25 +141,6 @@ services:
|
||||
max-size: "10Mb"
|
||||
max-file: "5"
|
||||
|
||||
# Uncomment this section to use a dedicated database for Nginx Proxy Manager
|
||||
# proxy-db:
|
||||
# image: 'jc21/mariadb-aria:latest'
|
||||
# restart: always
|
||||
# environment:
|
||||
# MYSQL_ROOT_PASSWORD: "${PROXY_MYSQL_PASS_ROOT?err}"
|
||||
# MYSQL_DATABASE: 'npm'
|
||||
# MYSQL_USER: 'npm'
|
||||
# MYSQL_PASSWORD: "${PROXY_MYSQL_PASS?err}"
|
||||
# ports:
|
||||
# - 3306
|
||||
# volumes:
|
||||
# - proxy-db:/var/lib/mysql
|
||||
# logging:
|
||||
# driver: "json-file"
|
||||
# options:
|
||||
# max-size: "1Mb"
|
||||
# max-file: "5"
|
||||
|
||||
volumes:
|
||||
redis-data:
|
||||
static-volume:
|
||||
|
Loading…
x
Reference in New Issue
Block a user