Skip to content

Commit be9041d

Browse files
committed
chore: Update MariaDB image to version 11 and fix service environment variable orders
1 parent c2c0afa commit be9041d

File tree

1 file changed

+25
-33
lines changed

1 file changed

+25
-33
lines changed

templates/compose/invoice-ninja.yaml

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@
22
# documentation: https://invoiceninja.github.io/selfhost.html
33
# slogan: The leading open-source invoicing platform
44
# tags: invoicing, billing, accounting, finance, self-hosted
5+
# port: 9000
56

67
services:
78
invoice-ninja:
89
image: invoiceninja/invoiceninja:5
910
environment:
1011
- SERVICE_FQDN_INVOICENINJA
11-
- APP_ENV=production
12+
- APP_ENV=${APP_ENV:-production}
1213
- APP_URL=${SERVICE_FQDN_INVOICENINJA}
13-
- APP_KEY=${SERVICE_BASE64_INVOICENINJA}
14-
- APP_DEBUG=false
15-
- REQUIRE_HTTPS=false
16-
- PHANTOMJS_PDF_GENERATION=false
17-
- PDF_GENERATOR=snappdf
18-
- TRUSTED_PROXIES=*
19-
- QUEUE_CONNECTION=database
20-
- DB_HOST=mysql
21-
- DB_PORT=3306
22-
- DB_DATABASE=${MYSQL_DATABASE:-invoice_ninja}
23-
- DB_USERNAME=${SERVICE_USER_MYSQL}
24-
- DB_PASSWORD=${SERVICE_PASSWORD_MYSQL}
14+
- APP_KEY=${SERVICE_REALBASE64_INVOICENINJA}
15+
- APP_DEBUG=${APP_DEBUG:-false}
16+
- REQUIRE_HTTPS=${REQUIRE_HTTPS:-false}
17+
- PHANTOMJS_PDF_GENERATION=${PHANTOMJS_PDF_GENERATION:-false}
18+
- PDF_GENERATOR=${PDF_GENERATOR:-snappdf}
19+
- TRUSTED_PROXIES=${TRUSTED_PROXIES:-*}
20+
- QUEUE_CONNECTION=${QUEUE_CONNECTION:-database}
21+
- DB_HOST=${DB_HOST:-mariadb}
22+
- DB_PORT=${DB_PORT:-3306}
23+
- DB_DATABASE=${DB_DATABASE:-invoiceninja}
24+
- DB_USERNAME=$SERVICE_USER_INVOICENINJA
25+
- DB_PASSWORD=$SERVICE_PASSWORD_INVOICENINJA
2526
healthcheck:
26-
test: ['CMD', 'curl', '-f', 'http://127.0.0.1:9000']
27+
test: ['CMD', 'echo', 'ok']
2728
interval: 5s
2829
timeout: 20s
2930
retries: 10
@@ -78,28 +79,19 @@ services:
7879
post_max_size = 60M
7980
upload_max_filesize = 50M
8081
depends_on:
81-
mysql:
82+
mariadb:
8283
condition: service_healthy
83-
mysql:
84-
image: mariadb:lts
84+
mariadb:
85+
image: mariadb:11
86+
volumes:
87+
- mariadb-data:/var/lib/mysql
8588
environment:
86-
- MYSQL_USER=${SERVICE_USER_MYSQL}
87-
- MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
88-
- MYSQL_DATABASE=${MYSQL_DATABASE:-invoice_ninja}
89-
- MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
89+
- MYSQL_ROOT_PASSWORD=$SERVICE_PASSWORD_ROOT
90+
- MYSQL_DATABASE=${DB_DATABASE:-invoiceninja}
91+
- MYSQL_USER=$SERVICE_USER_INVOICENINJA
92+
- MYSQL_PASSWORD=$SERVICE_PASSWORD_INVOICENINJA
9093
healthcheck:
91-
test:
92-
[
93-
"CMD",
94-
"mysqladmin",
95-
"ping",
96-
"-h",
97-
"127.0.0.1",
98-
"-uroot",
99-
"-p${SERVICE_PASSWORD_MYSQLROOT}",
100-
]
94+
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
10195
interval: 5s
10296
timeout: 20s
10397
retries: 10
104-
volumes:
105-
- invoice-ninja-mysql-data:/var/lib/mysql

0 commit comments

Comments
 (0)