Skip to content

Commit 1b8365d

Browse files
JuanxCursedJuanxCursed
committed
fix code review reported issues
- fix typo on healthcheck conditions - fix db connections - improve some default values - add plugins and update persistance
1 parent 380f2f4 commit 1b8365d

File tree

1 file changed

+69
-55
lines changed

1 file changed

+69
-55
lines changed

‎templates/compose/mautic5.yaml

Lines changed: 69 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -9,103 +9,117 @@ services:
99
image: 'mysql:8.0'
1010
environment:
1111
- 'MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_64_MYSQLROOT}'
12-
- 'MYSQL_DATABASE=${MYSQL_DATABASE}'
13-
- 'MYSQL_USER=${MYSQL_USER}'
12+
- 'MYSQL_DATABASE=${MYSQL_DATABASE:-mautic}'
13+
- 'MYSQL_USER=${SERVICE_USER_MYSQL}'
1414
- 'MYSQL_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}'
1515
volumes:
1616
- 'mysql-data:/var/lib/mysql'
1717
healthcheck:
18-
test: 'mysqladmin --user=$$MYSQL_USER --password=$$SERVICE_PASSWORD_64_MYSQL ping'
19-
start_period: 5s
20-
interval: 5s
18+
test: 'mysqladmin ping --silent --user=$$SERVICE_USER_MYSQL --password=$$SERVICE_PASSWORD_64_MYSQL'
19+
start_period: 30s
20+
interval: 10s
2121
timeout: 5s
22-
retries: 10
22+
retries: 5
2323
rabbitmq:
2424
image: 'rabbitmq:3'
2525
environment:
26-
- 'RABBITMQ_DEFAULT_VHOST=${RABBITMQ_DEFAULT_VHOST}'
26+
- 'RABBITMQ_DEFAULT_VHOST=${RABBITMQ_DEFAULT_VHOST:-mautic}'
2727
volumes:
2828
- 'rabbitmq-data:/var/lib/rabbitmq'
2929
mautic_web:
3030
image: 'mautic/mautic:latest'
3131
ports:
32-
- 8880:80
32+
- '8880:80'
3333
volumes:
34-
- './mautic/config:/var/www/html/config:z'
35-
- './mautic/logs:/var/www/html/var/logs:z'
36-
- './mautic/media/files:/var/www/html/docroot/media/files:z'
37-
- './mautic/media/images:/var/www/html/docroot/media/images:z'
38-
- './cron:/opt/mautic/cron:z'
34+
- 'mautic_data/config:/var/www/html/config:z'
35+
- 'mautic_data/logs:/var/www/html/var/logs:z'
36+
- 'mautic_data/media/files:/var/www/html/docroot/media/files:z'
37+
- 'mautic_data/media/images:/var/www/html/docroot/media/images:z'
38+
- 'mautic_data/plugins:/var/www/html/docroot/plugins:z'
39+
- 'mautic_data/vendor:/var/www/html/vendor:z'
40+
- 'mautic_data/bin:/var/www/html/bin:z'
41+
- 'mautic_data/cron:/opt/mautic/cron:z'
3942
environment:
4043
- SERVICE_FQDN_MAUTIC_80
4144
- 'DOCKER_MAUTIC_LOAD_TEST_DATA=${MAUTIC_LOAD_TEST_DATA:-false}'
4245
- 'DOCKER_MAUTIC_RUN_MIGRATIONS=${MAUTIC_RUN_MIGRATIONS:-false}'
43-
- 'MAUTIC_DB_HOST=${MYSQL_HOST}'
44-
- 'MAUTIC_DB_PORT=${MYSQL_PORT}'
45-
- 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE}'
46-
- 'MAUTIC_DB_USER=${MYSQL_USER}'
46+
- 'MAUTIC_DB_HOST=${MYSQL_HOST:-db}'
47+
- 'MAUTIC_DB_PORT=${MYSQL_PORT:-3306}'
48+
- 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE:-mautic}'
49+
- 'MAUTIC_DB_USER=${SERVICE_USER_MYSQL}'
4750
- 'MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}'
48-
- 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL}'
49-
- 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT}'
51+
- 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
52+
- 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
5053
healthcheck:
51-
test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
52-
interval: 2s
54+
test:
55+
- CMD
56+
- curl
57+
- '-f'
58+
- 'http://localhost'
59+
interval: 15s
5360
timeout: 10s
5461
retries: 15
55-
depends_on:
56-
db:
57-
condition: service_healthy
5862
mautic_cron:
5963
image: 'mautic/mautic:latest'
60-
links:
61-
- 'db:mysql'
6264
volumes:
63-
- './mautic/config:/var/www/html/config:z'
64-
- './mautic/logs:/var/www/html/var/logs:z'
65-
- './mautic/media/files:/var/www/html/docroot/media/files:z'
66-
- './mautic/media/images:/var/www/html/docroot/media/images:z'
67-
- './cron:/opt/mautic/cron:z'
65+
- 'mautic_data/config:/var/www/html/config:z'
66+
- 'mautic_data/logs:/var/www/html/var/logs:z'
67+
- 'mautic_data/media/files:/var/www/html/docroot/media/files:z'
68+
- 'mautic_data/media/images:/var/www/html/docroot/media/images:z'
69+
- 'mautic_data/plugins:/var/www/html/docroot/plugins:z'
70+
- 'mautic_data/vendor:/var/www/html/vendor:z'
71+
- 'mautic_data/bin:/var/www/html/bin:z'
72+
- 'mautic_data/cron:/opt/mautic/cron:z'
6873
environment:
6974
- DOCKER_MAUTIC_ROLE=mautic_cron
70-
- 'MAUTIC_DB_HOST=${MYSQL_HOST}'
71-
- 'MAUTIC_DB_PORT=${MYSQL_PORT}'
72-
- 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE}'
73-
- 'MAUTIC_DB_USER=${MYSQL_USER}'
75+
- 'MAUTIC_DB_HOST=${MYSQL_HOST:-db}'
76+
- 'MAUTIC_DB_PORT=${MYSQL_PORT:-3306}'
77+
- 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE:-mautic}'
78+
- 'MAUTIC_DB_USER=${SERVICE_USER_MYSQL}'
7479
- 'MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}'
75-
- 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL}'
76-
- 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT}'
80+
- 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
81+
- 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
7782
depends_on:
7883
mautic_web:
7984
condition: service_healthy
8085
healthcheck:
81-
test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
82-
interval: 2s
86+
test:
87+
- CMD
88+
- curl
89+
- '-f'
90+
- 'http://localhost'
91+
interval: 15s
8392
timeout: 10s
8493
retries: 15
8594
mautic_worker:
8695
image: 'mautic/mautic:latest'
87-
links:
88-
- 'db:mysql'
8996
volumes:
90-
- './mautic/config:/var/www/html/config:z'
91-
- './mautic/logs:/var/www/html/var/logs:z'
92-
- './mautic/media/files:/var/www/html/docroot/media/files:z'
93-
- './mautic/media/images:/var/www/html/docroot/media/images:z'
94-
- './cron:/opt/mautic/cron:z'
97+
- 'mautic_data/config:/var/www/html/config:z'
98+
- 'mautic_data/logs:/var/www/html/var/logs:z'
99+
- 'mautic_data/media/files:/var/www/html/docroot/media/files:z'
100+
- 'mautic_data/media/images:/var/www/html/docroot/media/images:z'
101+
- 'mautic_data/plugins:/var/www/html/docroot/plugins:z'
102+
- 'mautic_data/vendor:/var/www/html/vendor:z'
103+
- 'mautic_data/bin:/var/www/html/bin:z'
104+
- 'mautic_data/cron:/opt/mautic/cron:z'
95105
environment:
96106
- DOCKER_MAUTIC_ROLE=mautic_worker
97-
- 'MAUTIC_DB_HOST=${MYSQL_HOST}'
98-
- 'MAUTIC_DB_PORT=${MYSQL_PORT}'
99-
- 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE}'
100-
- 'MAUTIC_DB_USER=${MYSQL_USER}'
107+
- 'MAUTIC_DB_HOST=${MYSQL_HOST:-db}'
108+
- 'MAUTIC_DB_PORT=${MYSQL_PORT:-3306}'
109+
- 'MAUTIC_DB_DATABASE=${MYSQL_DATABASE:-mautic}'
110+
- 'MAUTIC_DB_USER=${SERVICE_USER_MYSQL}'
101111
- 'MAUTIC_DB_PASSWORD=${SERVICE_PASSWORD_64_MYSQL}'
102-
- 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL}'
103-
- 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT}'
112+
- 'MAUTIC_MESSENGER_DSN_EMAIL=${MAUTIC_MESSENGER_DSN_EMAIL:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
113+
- 'MAUTIC_MESSENGER_DSN_HIT=${MAUTIC_MESSENGER_DSN_HIT:-amqp://guest:guest@rabbitmq:5672/mautic/messages}'
104114
depends_on:
105115
mautic_web:
106-
condition: service_health
116+
condition: service_healthy
107117
healthcheck:
108-
test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
109-
interval: 2s
118+
test:
119+
- CMD
120+
- curl
121+
- '-f'
122+
- 'http://localhost'
123+
interval: 15s
110124
timeout: 10s
111125
retries: 15

0 commit comments

Comments
 (0)