Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Elao - App - Docker] MariaDB 11.4 #444

Merged
merged 1 commit into from
Sep 20, 2024
Merged

[Elao - App - Docker] MariaDB 11.4 #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion elao.app.docker/.manala.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ system:
version: ~
mariadb:
# @option {"label": "MariaDB version"}
# @schema {"enum": [null, 10.11, 10.6, 10.5, 10.4, 10.3, 10.2, 10.1]}
# @schema {"enum": [null, 11.4, 10.11, 10.6, 10.5, 10.4, 10.3, 10.2, 10.1]}
version: ~
mysql:
# @option {"label": "MySQL version"}
Expand Down
9 changes: 7 additions & 2 deletions elao.app.docker/.manala/docker/services/mariadb/compose.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@ services:
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
network_mode: service:app
healthcheck:
{{- if le (.Vars.system.mariadb.version|float64) 10.1 }}
test: mysqladmin ping --silent --host 0.0.0.0
interval: 30s
timeout: 30s
{{- else }}
# See: https://mariadb.com/kb/en/using-healthcheck-sh/
test: healthcheck.sh --connect --innodb_initialized
{{- end }}
interval: 10s
timeout: 5s
retries: 3
start_period: 0s

Expand Down
2 changes: 1 addition & 1 deletion elao.app.docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ system:
# command=/bin/foo
# MariaDB
mariadb:
version: 10.11
version: 11.4
# ...*OR* MySQL...
mysql:
version: "8.0"
Expand Down
2 changes: 1 addition & 1 deletion elao.app.docker/test/.manala.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ system:
packages:
- package: sass
mariadb:
version: 10.11
version: 11.4
redis:
version: "*"
elasticsearch:
Expand Down