ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2026-01-27 12:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix code review reported issues

Browse Source 
- fix typo on healthcheck conditions
- fix db connections
- improve some default values
- add plugins and update persistance
This commit is contained in:
Juan Felipe
2024-09-19 12:07:00 -03:00
parent 380f2f4029
commit 1b8365d559
1 changed files with 69 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
templates/compose/mautic5.yaml
View File

@@ -9,103 +9,117 @@ services:
image: 'mysql:8.0' image: 'mysql:8.0'
environment: environment:
- 'MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_64_MYSQLROOT}' - 'MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_64_MYSQLROOT}'
- 'MYSQL_DATABASE=${MYSQL_DATABASE}' - 'MYSQL_DATABASE=${MYSQL_DATABASE:-mautic}'
- 'MYSQL_USER=${MYSQL_USER}' - 'MYSQL_USER=${SERVICE_USER_MYSQL}'
- 'MYSQL_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}' - 'MYSQL_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}'
volumes: volumes:
- 'mysql-data:/var/lib/mysql' - 'mysql-data:/var/lib/mysql'
healthcheck: healthcheck:
test: 'mysqladmin --user=$$MYSQL_USER --password=$$SERVICE_PASSWORD_64_MYSQL ping' test: 'mysqladmin ping --silent --user=$$SERVICE_USER_MYSQL --password=$$SERVICE_PASSWORD_64_MYSQL'
start_period: 5s start_period: 30s
interval: 5s interval: 10s
timeout: 5s timeout: 5s
retries: 10 retries: 5
rabbitmq: rabbitmq:
image: 'rabbitmq:3' image: 'rabbitmq:3'
environment: environment:
- 'RABBITMQ_DEFAULT_VHOST=${RABBITMQ_DEFAULT_VHOST}' - 'RABBITMQ_DEFAULT_VHOST=${RABBITMQ_DEFAULT_VHOST:-mautic}'
volumes: volumes:
- 'rabbitmq-data:/var/lib/rabbitmq' - 'rabbitmq-data:/var/lib/rabbitmq'
mautic_web: mautic_web:
image: 'mautic/mautic:latest' image: 'mautic/mautic:latest'
ports: ports:
- 8880:80 - '8880:80'
volumes: volumes:
- './mautic/config:/var/www/html/config:z' - 'mautic_data/config:/var/www/html/config:z'
- './mautic/logs:/var/www/html/var/logs:z' - 'mautic_data/logs:/var/www/html/var/logs:z'
- './mautic/media/files:/var/www/html/docroot/media/files:z' - 'mautic_data/media/files:/var/www/html/docroot/media/files:z'
- './mautic/media/images:/var/www/html/docroot/media/images:z' - 'mautic_data/media/images:/var/www/html/docroot/media/images:z'
- './cron:/opt/mautic/cron:z' - 'mautic_data/plugins:/var/www/html/docroot/plugins:z'
- 'mautic_data/vendor:/var/www/html/vendor:z'
- 'mautic_data/bin:/var/www/html/bin:z'
- 'mautic_data/cron:/opt/mautic/cron:z'
environment: environment:
- SERVICE_FQDN_MAUTIC_80 - SERVICE_FQDN_MAUTIC_80
- 'DOCKER_MAUTIC_LOAD_TEST_DATA=${MAUTIC_LOAD_TEST_DATA:-false}' - 'DOCKER_MAUTIC_LOAD_TEST_DATA=${MAUTIC_LOAD_TEST_DATA:-false}'
- 'DOCKER_MAUTIC_RUN_MIGRATIONS=${MAUTIC_RUN_MIGRATIONS:-false}' - 'DOCKER_MAUTIC_RUN_MIGRATIONS=${MAUTIC_RUN_MIGRATIONS:-false}'
- 'MAUTIC_DB_HOST=${MYSQL_HOST}' - 'MAUTIC_DB_HOST=${MYSQL_HOST:-db}'
- 'MAUTIC_DB_PORT=${MYSQL_PORT}' - 'MAUTIC_DB_PORT=${MYSQL_PORT:-3306}'
- 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE}' - 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE:-mautic}'
- 'MAUTIC_DB_USER=${MYSQL_USER}' - 'MAUTIC_DB_USER=${SERVICE_USER_MYSQL}'
- 'MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}' - 'MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}'
- 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL}' - 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
- 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT}' - 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://127.0.0.1:80"] test:
interval: 2s - CMD
- curl
- '-f'
- 'http://localhost'
interval: 15s
timeout: 10s timeout: 10s
retries: 15 retries: 15
depends_on:
db:
condition: service_healthy
mautic_cron: mautic_cron:
image: 'mautic/mautic:latest' image: 'mautic/mautic:latest'
links:
- 'db:mysql'
volumes: volumes:
- './mautic/config:/var/www/html/config:z' - 'mautic_data/config:/var/www/html/config:z'
- './mautic/logs:/var/www/html/var/logs:z' - 'mautic_data/logs:/var/www/html/var/logs:z'
- './mautic/media/files:/var/www/html/docroot/media/files:z' - 'mautic_data/media/files:/var/www/html/docroot/media/files:z'
- './mautic/media/images:/var/www/html/docroot/media/images:z' - 'mautic_data/media/images:/var/www/html/docroot/media/images:z'
- './cron:/opt/mautic/cron:z' - 'mautic_data/plugins:/var/www/html/docroot/plugins:z'
- 'mautic_data/vendor:/var/www/html/vendor:z'
- 'mautic_data/bin:/var/www/html/bin:z'
- 'mautic_data/cron:/opt/mautic/cron:z'
environment: environment:
- DOCKER_MAUTIC_ROLE=mautic_cron - DOCKER_MAUTIC_ROLE=mautic_cron
- 'MAUTIC_DB_HOST=${MYSQL_HOST}' - 'MAUTIC_DB_HOST=${MYSQL_HOST:-db}'
- 'MAUTIC_DB_PORT=${MYSQL_PORT}' - 'MAUTIC_DB_PORT=${MYSQL_PORT:-3306}'
- 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE}' - 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE:-mautic}'
- 'MAUTIC_DB_USER=${MYSQL_USER}' - 'MAUTIC_DB_USER=${SERVICE_USER_MYSQL}'
- 'MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}' - 'MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}'
- 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL}' - 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
- 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT}' - 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
depends_on: depends_on:
mautic_web: mautic_web:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://127.0.0.1:80"] test:
interval: 2s - CMD
- curl
- '-f'
- 'http://localhost'
interval: 15s
timeout: 10s timeout: 10s
retries: 15 retries: 15
mautic_worker: mautic_worker:
image: 'mautic/mautic:latest' image: 'mautic/mautic:latest'
links:
- 'db:mysql'
volumes: volumes:
- './mautic/config:/var/www/html/config:z' - 'mautic_data/config:/var/www/html/config:z'
- './mautic/logs:/var/www/html/var/logs:z' - 'mautic_data/logs:/var/www/html/var/logs:z'
- './mautic/media/files:/var/www/html/docroot/media/files:z' - 'mautic_data/media/files:/var/www/html/docroot/media/files:z'
- './mautic/media/images:/var/www/html/docroot/media/images:z' - 'mautic_data/media/images:/var/www/html/docroot/media/images:z'
- './cron:/opt/mautic/cron:z' - 'mautic_data/plugins:/var/www/html/docroot/plugins:z'
- 'mautic_data/vendor:/var/www/html/vendor:z'
- 'mautic_data/bin:/var/www/html/bin:z'
- 'mautic_data/cron:/opt/mautic/cron:z'
environment: environment:
- DOCKER_MAUTIC_ROLE=mautic_worker - DOCKER_MAUTIC_ROLE=mautic_worker
- 'MAUTIC_DB_HOST=${MYSQL_HOST}' - 'MAUTIC_DB_HOST=${MYSQL_HOST:-db}'
- 'MAUTIC_DB_PORT=${MYSQL_PORT}' - 'MAUTIC_DB_PORT=${MYSQL_PORT:-3306}'
- 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE}' - 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE:-mautic}'
- 'MAUTIC_DB_USER=${MYSQL_USER}' - 'MAUTIC_DB_USER=${SERVICE_USER_MYSQL}'
- 'MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}' - 'MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}'
- 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL}' - 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
- 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT}' - 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
depends_on: depends_on:
mautic_web: mautic_web:
condition: service_health condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://127.0.0.1:80"] test:
interval: 2s - CMD
- curl
- '-f'
- 'http://localhost'
interval: 15s
timeout: 10s timeout: 10s
retries: 15 retries: 15