dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Update MariaDB image to version 11 and fix service environment variable orders

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-04 12:20:35 +02:00
parent c2c0afa0ba
commit be9041d592
1 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
templates/compose/invoice-ninja.yaml
View File

@@ -2,28 +2,29 @@
# documentation: https://invoiceninja.github.io/selfhost.html # documentation: https://invoiceninja.github.io/selfhost.html
# slogan: The leading open-source invoicing platform # slogan: The leading open-source invoicing platform
# tags: invoicing, billing, accounting, finance, self-hosted # tags: invoicing, billing, accounting, finance, self-hosted
# port: 9000
services: services:
invoice-ninja: invoice-ninja:
image: invoiceninja/invoiceninja:5 image: invoiceninja/invoiceninja:5
environment: environment:
- SERVICE_FQDN_INVOICENINJA - SERVICE_FQDN_INVOICENINJA
- APP_ENV=production - APP_ENV=${APP_ENV:-production}
- APP_URL=${SERVICE_FQDN_INVOICENINJA} - APP_URL=${SERVICE_FQDN_INVOICENINJA}
- APP_KEY=${SERVICE_BASE64_INVOICENINJA} - APP_KEY=${SERVICE_REALBASE64_INVOICENINJA}
- APP_DEBUG=false - APP_DEBUG=${APP_DEBUG:-false}
- REQUIRE_HTTPS=false - REQUIRE_HTTPS=${REQUIRE_HTTPS:-false}
- PHANTOMJS_PDF_GENERATION=false - PHANTOMJS_PDF_GENERATION=${PHANTOMJS_PDF_GENERATION:-false}
- PDF_GENERATOR=snappdf - PDF_GENERATOR=${PDF_GENERATOR:-snappdf}
- TRUSTED_PROXIES=* - TRUSTED_PROXIES=${TRUSTED_PROXIES:-*}
- QUEUE_CONNECTION=database - QUEUE_CONNECTION=${QUEUE_CONNECTION:-database}
- DB_HOST=mysql - DB_HOST=${DB_HOST:-mariadb}
- DB_PORT=3306 - DB_PORT=${DB_PORT:-3306}
- DB_DATABASE=${MYSQL_DATABASE:-invoice_ninja} - DB_DATABASE=${DB_DATABASE:-invoiceninja}
- DB_USERNAME=${SERVICE_USER_MYSQL} - DB_USERNAME=$SERVICE_USER_INVOICENINJA
- DB_PASSWORD=${SERVICE_PASSWORD_MYSQL} - DB_PASSWORD=$SERVICE_PASSWORD_INVOICENINJA
healthcheck: healthcheck:
test: ['CMD', 'curl', '-f', 'http://127.0.0.1:9000'] test: ['CMD', 'echo', 'ok']
interval: 5s interval: 5s
timeout: 20s timeout: 20s
retries: 10 retries: 10
@@ -78,28 +79,19 @@ services:
post_max_size = 60M post_max_size = 60M
upload_max_filesize = 50M upload_max_filesize = 50M
depends_on: depends_on:
mysql: mariadb:
condition: service_healthy condition: service_healthy
mysql: mariadb:
image: mariadb:lts image: mariadb:11
volumes:
- mariadb-data:/var/lib/mysql
environment: environment:
- MYSQL_USER=${SERVICE_USER_MYSQL} - MYSQL_ROOT_PASSWORD=$SERVICE_PASSWORD_ROOT
- MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL} - MYSQL_DATABASE=${DB_DATABASE:-invoiceninja}
- MYSQL_DATABASE=${MYSQL_DATABASE:-invoice_ninja} - MYSQL_USER=$SERVICE_USER_INVOICENINJA
- MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT} - MYSQL_PASSWORD=$SERVICE_PASSWORD_INVOICENINJA
healthcheck: healthcheck:
test: test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
[
"CMD",
"mysqladmin",
"ping",
"-h",
"127.0.0.1",
"-uroot",
"-p${SERVICE_PASSWORD_MYSQLROOT}",
]
interval: 5s interval: 5s
timeout: 20s timeout: 20s
retries: 10 retries: 10
volumes:
- invoice-ninja-mysql-data:/var/lib/mysql